From 1c66479b7d134081f9e2091b719538e7d8b26fe5 Mon Sep 17 00:00:00 2001 From: Muhammad Nauman Raza Date: Sat, 23 Mar 2024 16:29:22 +0000 Subject: [PATCH] feat: more colours --- kagayaki.lua | 213 ++++++++++++++++++++++++++++++++++++++ lua/kagayaki/kagayaki.lua | 16 +-- 2 files changed, 221 insertions(+), 8 deletions(-) create mode 100644 kagayaki.lua diff --git a/kagayaki.lua b/kagayaki.lua new file mode 100644 index 0000000..5439aed --- /dev/null +++ b/kagayaki.lua @@ -0,0 +1,213 @@ +-- +-- Built with, +-- +-- ,gggg, +-- d8" "8I ,dPYb, +-- 88 ,dP IP'`Yb +-- 8888888P" I8 8I +-- 88 I8 8' +-- 88 gg gg ,g, I8 dPgg, +-- ,aa,_88 I8 8I ,8'8, I8dP" "8I +-- dP" "88P I8, ,8I ,8' Yb I8P I8 +-- Yb,_,d88b,,_ ,d8b, ,d8b,,8'_ 8) ,d8 I8, +-- "Y8P" "Y888888P'"Y88P"`Y8P' "YY8P8P88P `Y8 +-- + +local lush = require('lush') +local hsl = lush.hsl + +local theme = lush(function(injected_functions) + local sym = injected_functions.sym + return { + -- ColorColumn { }, -- Columns set with 'colorcolumn' + -- Conceal { }, -- Placeholder characters substituted for concealed text (see 'conceallevel') + -- Cursor { }, -- Character under the cursor + -- CurSearch { }, -- Highlighting a search pattern under the cursor (see 'hlsearch') + -- lCursor { }, -- Character under the cursor when |language-mapping| is used (see 'guicursor') + -- CursorIM { }, -- Like Cursor, but used when in IME mode |CursorIM| + -- CursorColumn { }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + Directory { fg = hsl("#a292e8") }, -- Directory names (and other special names in listings) + -- DiffAdd { }, -- Diff mode: Added line |diff.txt| + -- DiffChange { }, -- Diff mode: Changed line |diff.txt| + -- DiffDelete { }, -- Diff mode: Deleted line |diff.txt| + -- DiffText { }, -- Diff mode: Changed text within a changed line |diff.txt| + -- EndOfBuffer { }, -- Filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + -- TermCursor { }, -- Cursor in a focused terminal + -- TermCursorNC { }, -- Cursor in an unfocused terminal + ErrorMsg { fg = hsl("#f06969") }, -- Error messages on the command line + -- VertSplit { }, -- Column separating vertically split windows + -- FoldColumn { }, -- 'foldcolumn' + SignColumn { }, -- Column where |signs| are displayed + -- IncSearch { }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + -- Substitute { }, -- |:substitute| replacement text highlighting + -- LineNrAbove { }, -- Line number for when the 'relativenumber' option is set, above the cursor line + -- LineNrBelow { }, -- Line number for when the 'relativenumber' option is set, below the cursor line + CursorLineNr { fg = hsl("#a292e8"), gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + -- CursorLineFold { }, -- Like FoldColumn when 'cursorline' is set for the cursor line + -- CursorLineSign { }, -- Like SignColumn when 'cursorline' is set for the cursor line + -- MatchParen { }, -- Character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") + -- MsgArea { }, -- Area for messages and cmdline + -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display' + -- MoreMsg { }, -- |more-prompt| + Normal { bg = hsl("#151517"), fg = hsl("#ece5ea") }, -- Normal text + Folded { }, -- Line used for closed folds + LineNr { fg = hsl("#454449") }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + NonText { fg = hsl("#454449") }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. + CursorLine { bg = Normal.bg.lighten(5) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + NormalFloat { bg = Normal.bg, fg = Normal.fg }, -- Normal text in floating windows. + -- FloatBorder { }, -- Border of floating windows. + FloatTitle { fg = hsl("#e887bb"), gui = "bold" }, -- Title of floating windows. + -- NormalNC { }, -- normal text in non-current windows + Pmenu { bg = Normal.bg, fg = Normal.fg}, -- Popup menu: Normal item. + PmenuSel { bg = Normal.bg.lighten(10) }, -- Popup menu: Selected item. + -- PmenuKind { }, -- Popup menu: Normal item "kind" + -- PmenuKindSel { }, -- Popup menu: Selected item "kind" + -- PmenuExtra { }, -- Popup menu: Normal item "extra text" + -- PmenuExtraSel { }, -- Popup menu: Selected item "extra text" + PmenuSbar { bg = Normal.bg.lighten(5) }, -- Popup menu: Scrollbar. + PmenuThumb { bg = hsl("#a292e8") }, -- Popup menu: Thumb of the scrollbar. + -- Question { }, -- |hit-enter| prompt and yes/no questions + -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search { fg = hsl("#78b9c4"), gui = "bold underline" }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + -- SpecialKey { }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + -- SpellBad { }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + -- SpellCap { }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + -- SpellLocal { }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. + -- SpellRare { }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + StatusLine { bg = Normal.bg.lighten(5), fg = hsl("#7ee6ae") }, -- Status line of current window + -- StatusLineNC { }, -- Status lines of not-current windows. Note: If this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine { bg = Normal.bg.lighten(5), fg = Normal.fg.lighten(5) }, -- Tab pages line, not active tab page label + -- TabLineFill { }, -- Tab pages line, where there are no labels + -- TabLineSel { }, -- Tab pages line, active tab page label + -- Title { }, -- Titles for output from ":set all", ":autocmd" etc. + Visual { bg = Normal.bg.lighten(10), fg = Normal.fg.saturate(50).darken(10) }, -- Visual mode selection + -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". + WarningMsg { fg = hsl("#f06969") }, -- Warning messages + -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + Winseparator { fg = hsl("#454449") }, -- Separator between window splits. Inherts from |hl-VertSplit| by default, which it will replace eventually. + -- WildMenu { }, -- Current match in 'wildmenu' completion + -- WinBar { }, -- Window bar of current window + -- WinBarNC { }, -- Window bar of not-current windows + + Comment { fg = hsl("#5c5c61") }, -- Any comment + + Constant { fg = hsl("#d9d564") }, -- (*) Any constant + -- String { }, -- A string constant: "this is a string" + -- Character { }, -- A character constant: 'c', '\n' + -- Number { }, -- A number constant: 234, 0xff + -- Boolean { }, -- A boolean constant: TRUE, false + -- Float { }, -- A floating point constant: 2.3e10 + + Identifier { fg = hsl("#78b9c4") }, -- (*) Any variable name + -- Function { }, -- Function name (also: methods for classes) + + Statement { fg = hsl("#a292e8") }, -- (*) Any statement + -- Conditional { }, -- if, then, else, endif, switch, etc. + -- Repeat { }, -- for, do, while, etc. + -- Label { }, -- case, default, etc. + -- Operator { }, -- "sizeof", "+", "*", etc. + -- Keyword { }, -- any other keyword + -- Exception { }, -- try, catch, throw + + PreProc { fg = hsl("#7ee6ae") }, -- (*) Generic Preprocessor + -- Include { }, -- Preprocessor #include + -- Define { }, -- Preprocessor #define + -- Macro { }, -- Same as Define + -- PreCondit { }, -- Preprocessor #if, #else, #endif, etc. + + Type { fg = hsl("#91d65c") }, -- (*) int, long, char, etc. + -- StorageClass { }, -- static, register, volatile, etc. + -- Structure { }, -- struct, union, enum, etc. + -- Typedef { }, -- A typedef + + Special { fg = hsl("#e887bb") }, -- (*) Any special symbol + -- SpecialChar { }, -- Special character in a constant + -- Tag { }, -- You can use CTRL-] on this + -- Delimiter { }, -- Character that needs attention + -- SpecialComment { }, -- Special things inside a comment (e.g. '\n') + -- Debug { }, -- Debugging statements + + Underlined { gui = "underline", fg = hsl("#78b9c4") }, -- Text that stands out, HTML links + -- Ignore { }, -- Left blank, hidden |hl-Ignore| (NOTE: May be invisible here in template) + Error { fg = hsl("#f06969") }, -- Any erroneous construct + Todo { bg = Normal.bg.lighten(15), fg = hsl("#78b9c4") }, -- Anything that needs extra attention; mostly the keywords TODO FIXME and XXX + + -- DiagnosticError { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticWarn { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticInfo { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticHint { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticOk { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticVirtualTextError { } , -- Used for "Error" diagnostic virtual text. + -- DiagnosticVirtualTextWarn { } , -- Used for "Warn" diagnostic virtual text. + -- DiagnosticVirtualTextInfo { } , -- Used for "Info" diagnostic virtual text. + -- DiagnosticVirtualTextHint { } , -- Used for "Hint" diagnostic virtual text. + -- DiagnosticVirtualTextOk { } , -- Used for "Ok" diagnostic virtual text. + -- DiagnosticUnderlineError { } , -- Used to underline "Error" diagnostics. + -- DiagnosticUnderlineWarn { } , -- Used to underline "Warn" diagnostics. + -- DiagnosticUnderlineInfo { } , -- Used to underline "Info" diagnostics. + -- DiagnosticUnderlineHint { } , -- Used to underline "Hint" diagnostics. + -- DiagnosticUnderlineOk { } , -- Used to underline "Ok" diagnostics. + -- DiagnosticFloatingError { } , -- Used to color "Error" diagnostic messages in diagnostics float. See |vim.diagnostic.open_float()| + -- DiagnosticFloatingWarn { } , -- Used to color "Warn" diagnostic messages in diagnostics float. + -- DiagnosticFloatingInfo { } , -- Used to color "Info" diagnostic messages in diagnostics float. + -- DiagnosticFloatingHint { } , -- Used to color "Hint" diagnostic messages in diagnostics float. + -- DiagnosticFloatingOk { } , -- Used to color "Ok" diagnostic messages in diagnostics float. + -- DiagnosticSignError { } , -- Used for "Error" signs in sign column. + -- DiagnosticSignWarn { } , -- Used for "Warn" signs in sign column. + -- DiagnosticSignInfo { } , -- Used for "Info" signs in sign column. + -- DiagnosticSignHint { } , -- Used for "Hint" signs in sign column. + -- DiagnosticSignOk { } , -- Used for "Ok" signs in sign column. + + -- sym"@text.literal" { }, -- Comment + -- sym"@text.reference" { }, -- Identifier + -- sym"@text.title" { }, -- Title + -- sym"@text.uri" { }, -- Underlined + -- sym"@text.underline" { }, -- Underlined + -- sym"@text.todo" { }, -- Todo + -- sym"@comment" { }, -- Comment + -- sym"@punctuation" { }, -- Delimiter + -- sym"@constant" { }, -- Constant + -- sym"@constant.builtin" { }, -- Special + -- sym"@constant.macro" { }, -- Define + -- sym"@define" { }, -- Define + -- sym"@macro" { }, -- Macro + -- sym"@string" { }, -- String + -- sym"@string.escape" { }, -- SpecialChar + -- sym"@string.special" { }, -- SpecialChar + -- sym"@character" { }, -- Character + -- sym"@character.special" { }, -- SpecialChar + -- sym"@number" { }, -- Number + -- sym"@boolean" { }, -- Boolean + -- sym"@float" { }, -- Float + -- sym"@function" { }, -- Function + -- sym"@function.builtin" { }, -- Special + -- sym"@function.macro" { }, -- Macro + -- sym"@parameter" { }, -- Identifier + -- sym"@method" { }, -- Function + -- sym"@field" { }, -- Identifier + -- sym"@property" { }, -- Identifier + -- sym"@constructor" { }, -- Special + -- sym"@conditional" { }, -- Conditional + -- sym"@repeat" { }, -- Repeat + -- sym"@label" { }, -- Label + -- sym"@operator" { }, -- Operator + -- sym"@keyword" { }, -- Keyword + -- sym"@exception" { }, -- Exception + -- sym"@variable" { }, -- Identifier + -- sym"@type" { }, -- Type + -- sym"@type.definition" { }, -- Typedef + -- sym"@storageclass" { }, -- StorageClass + -- sym"@structure" { }, -- Structure + -- sym"@namespace" { }, -- Identifier + -- sym"@include" { }, -- Include + -- sym"@preproc" { }, -- PreProc + -- sym"@debug" { }, -- Debug + -- sym"@tag" { }, -- Tag +} +end) + +-- Return our parsed theme for extension or use elsewhere. +return theme + +-- vi:nowrap diff --git a/lua/kagayaki/kagayaki.lua b/lua/kagayaki/kagayaki.lua index 1ffed7a..5784593 100644 --- a/lua/kagayaki/kagayaki.lua +++ b/lua/kagayaki/kagayaki.lua @@ -26,11 +26,11 @@ local theme = lush(function(injected_functions) -- lCursor { }, -- Character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- Like Cursor, but used when in IME mode |CursorIM| -- CursorColumn { }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - -- Directory { }, -- Directory names (and other special names in listings) - -- DiffAdd { }, -- Diff mode: Added line |diff.txt| - -- DiffChange { }, -- Diff mode: Changed line |diff.txt| - -- DiffDelete { }, -- Diff mode: Deleted line |diff.txt| - -- DiffText { }, -- Diff mode: Changed text within a changed line |diff.txt| + Directory { fg = hsl("#a292e8") }, -- Directory names (and other special names in listings) + DiffAdd { bg = hsl("#78b9c4").darken(10) }, -- Diff mode: Added line |diff.txt| + DiffChange { bg = hsl("#a292e8").darken(10) }, -- Diff mode: Changed line |diff.txt| + DiffDelete { bg = hsl("#f06969").darken(10) }, -- Diff mode: Deleted line |diff.txt| + DiffText { gui = "bold underline" }, -- Diff mode: Changed text within a changed line |diff.txt| -- EndOfBuffer { }, -- Filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. -- TermCursor { }, -- Cursor in a focused terminal -- TermCursorNC { }, -- Cursor in an unfocused terminal @@ -80,12 +80,12 @@ local theme = lush(function(injected_functions) TabLine { bg = Normal.bg.lighten(5), fg = Normal.fg.lighten(5) }, -- Tab pages line, not active tab page label -- TabLineFill { }, -- Tab pages line, where there are no labels -- TabLineSel { }, -- Tab pages line, active tab page label - -- Title { }, -- Titles for output from ":set all", ":autocmd" etc. + Title { fg = Normal.fg, gui = "bold" }, -- Titles for output from ":set all", ":autocmd" etc. Visual { bg = Normal.bg.lighten(10), fg = Normal.fg.saturate(50).darken(10) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". WarningMsg { fg = hsl("#f06969") }, -- Warning messages -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - -- Winseparator { }, -- Separator between window splits. Inherts from |hl-VertSplit| by default, which it will replace eventually. + Winseparator { fg = hsl("#454449") }, -- Separator between window splits. Inherts from |hl-VertSplit| by default, which it will replace eventually. -- WildMenu { }, -- Current match in 'wildmenu' completion -- WinBar { }, -- Window bar of current window -- WinBarNC { }, -- Window bar of not-current windows @@ -128,7 +128,7 @@ local theme = lush(function(injected_functions) -- SpecialComment { }, -- Special things inside a comment (e.g. '\n') -- Debug { }, -- Debugging statements - Underlined { gui = "underline", fg = hsl("#a292e8") }, -- Text that stands out, HTML links + Underlined { gui = "underline", fg = hsl("#78b9c4") }, -- Text that stands out, HTML links -- Ignore { }, -- Left blank, hidden |hl-Ignore| (NOTE: May be invisible here in template) Error { fg = hsl("#f06969") }, -- Any erroneous construct Todo { bg = Normal.bg.lighten(15), fg = hsl("#78b9c4") }, -- Anything that needs extra attention; mostly the keywords TODO FIXME and XXX