diff --git a/lua/lush_theme/wormbait.lua b/lua/lush_theme/wormbait.lua index 3f2c56c..af7ab6a 100644 --- a/lua/lush_theme/wormbait.lua +++ b/lua/lush_theme/wormbait.lua @@ -13,35 +13,6 @@ -- "Y8P" "Y888888P'"Y88P"`Y8P' "YY8P8P88P `Y8 -- --- This is a starter colorscheme for use with Lush, --- for usage guides, see :h lush or :LushRunTutorial - --- --- Note: Because this is lua file, vim will append your file to the runtime, --- which means you can require(...) it in other lua code (this is useful), --- but you should also take care not to conflict with other libraries. --- --- (This is a lua quirk, as it has somewhat poor support for namespacing.) --- --- Basically, name your file, --- --- "super_theme/lua/lush_theme/super_theme_dark.lua", --- --- not, --- --- "super_theme/lua/dark.lua". --- --- With that caveat out of the way... --- - --- Enable lush.ify on this file, run: --- --- `:Lushify` --- --- or --- --- `:lua require('lush').ify()` - local lush = require('lush') local hsl = lush.hsl @@ -50,75 +21,69 @@ local hsl = lush.hsl ---@diagnostic disable: undefined-global local theme = lush(function() return { - -- The following are all the Neovim default highlight groups from the docs - -- as of 0.5.0-nightly-446, to aid your theme creation. Your themes should - -- probably style all of these at a bare minimum. - -- - -- Referenced/linked groups must come before being referenced/lined, - -- so the order shown ((mostly) alphabetical) is likely - -- not the order you will end up with. - -- - -- You can uncomment these and leave them empty to disable any - -- styling for that group (meaning they mostly get styled as Normal) - -- or leave them commented to apply vims default colouring or linking. + Normal { bg = hsl(0, 0, 14), fg = hsl(45, 18, 87) }, + CursorLine { bg = hsl(0, 0, 3) }, + Comment { fg = hsl(47, 6, 57), gui = "Italic" }, + Visual { bg = hsl(12, 6, 31) }, + Constant { fg = hsl(6, 70, 66) }, -- (preferred) any constant + String { fg = hsl(93, 73, 61), gui = "Italic" }, -- a string constant: "this is a string" + Keyword { fg = hsl(214, 86, 75) }, -- any other keyword + Function { fg = hsl(77, 67, 71) }, -- function name (also: methods for classes) + Cursor { bg = hsl(0, 0, 40), fg = CursorLine.bg }, -- character under the cursor + Error { fg = hsl(0, 100, 50) }, -- (preferred) any erroneous construct + WarningMsg { fg = hsl(34, 100, 50) }, -- warning messages + NonText { fg = hsl(0, 0, 30) }, -- '@' 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|. + Search { bg = hsl(280, 100, 76), fg = CursorLine.bg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - -- Comment { }, -- any comment - -- ColorColumn { }, -- used for the columns set with 'colorcolumn' - -- Conceal { }, -- placeholder characters substituted for concealed text (see 'conceallevel') - -- Cursor { }, -- character under the cursor - -- lCursor { }, -- the 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. - -- CursorLine { }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not 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| - -- 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 { }, -- error messages on the command line - -- VertSplit { }, -- the column separating vertically split windows - -- Folded { }, -- line used for closed folds - -- 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 - -- LineNr { }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - -- CursorLineNr { }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - -- MatchParen { }, -- The 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| - -- NonText { }, -- '@' 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|. - -- Normal { }, -- normal text - -- NormalFloat { }, -- Normal text in floating windows. - -- NormalNC { }, -- normal text in non-current windows - -- Pmenu { }, -- Popup menu: normal item. - -- PmenuSel { }, -- Popup menu: selected item. - -- PmenuSbar { }, -- Popup menu: scrollbar. - -- PmenuThumb { }, -- 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 { }, -- 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 { }, -- 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 { }, -- 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 { }, -- Visual mode selection - -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". - -- WarningMsg { }, -- warning messages - -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - -- WildMenu { }, -- current match in 'wildmenu' completion + ColorColumn { }, -- used for the columns set with 'colorcolumn' + Conceal { }, -- placeholder characters substituted for concealed text (see 'conceallevel') + lCursor { }, -- the 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 { Keyword }, -- 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 { bg = CursorLine.bg, fg = NonText.fg }, -- 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 { Error }, -- error messages on the command line + VertSplit { }, -- the column separating vertically split windows + Folded { }, -- line used for closed folds + FoldColumn { }, -- 'foldcolumn' + SignColumn { CursorLine }, -- column where |signs| are displayed + IncSearch { Search }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Substitute { }, -- |:substitute| replacement text highlighting + LineNr { bg = CursorLine.bg, fg = NonText.fg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr { bg = CursorLine.bg }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + MatchParen { gui = "bold" }, -- The 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| + NormalFloat { }, -- Normal text in floating windows. + NormalNC { }, -- normal text in non-current windows + Pmenu { }, -- Popup menu: normal item. + PmenuSel { bg = Keyword.fg, fg = CursorLine.bg }, -- Popup menu: selected item. + PmenuSbar { CursorLine }, -- Popup menu: scrollbar. + PmenuThumb { bg = NonText.fg }, -- 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. + SpecialKey { NonText }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + SpellBad { Error }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellCap { WarningMsg }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellLocal { WarningMsg }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. + SpellRare { WarningMsg }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + StatusLine { CursorLine }, -- 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 { }, -- 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. + VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". + Whitespace { NonText }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu { }, -- current match in 'wildmenu' completion -- These groups are not listed as default vim groups, -- but they are defacto standard group names for syntax highlighting. @@ -126,52 +91,46 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - -- Constant { }, -- (preferred) 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 + Character { String }, -- a character constant: 'c', '\n' + Number { Constant }, -- a number constant: 234, 0xff + Boolean { Constant }, -- a boolean constant: TRUE, false + Float { Constant }, -- a floating point constant: 2.3e10 - -- Identifier { }, -- (preferred) any variable name - -- Function { }, -- function name (also: methods for classes) + Identifier { }, -- (preferred) any variable name + Type { Function }, -- (preferred) int, long, char, etc. - -- Statement { }, -- (preferred) 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 + Statement { Keyword }, -- (preferred) any statement + Conditional { Keyword }, -- if, then, else, endif, switch, etc. + Repeat { Keyword }, -- for, do, while, etc. + Label { Keyword }, -- case, default, etc. + Operator { }, -- "sizeof", "+", "*", etc. + Exception { Keyword }, -- try, catch, throw - -- PreProc { }, -- (preferred) generic Preprocessor - -- Include { }, -- preprocessor #include - -- Define { }, -- preprocessor #define - -- Macro { }, -- same as Define - -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. + PreProc { Constant }, -- (preferred) generic Preprocessor + Include { Constant }, -- preprocessor #include + Define { Constant }, -- preprocessor #define + Macro { Constant }, -- same as Define + PreCondit { Constant }, -- preprocessor #if, #else, #endif, etc. - -- Type { }, -- (preferred) int, long, char, etc. - -- StorageClass { }, -- static, register, volatile, etc. - -- Structure { }, -- struct, union, enum, etc. - -- Typedef { }, -- A typedef + StorageClass { Keyword }, -- static, register, volatile, etc. + Structure { Keyword }, -- struct, union, enum, etc. + Typedef { }, -- A typedef - -- Special { }, -- (preferred) 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 - -- Debug { }, -- debugging statements + Special { }, -- (preferred) 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 + Debug { }, -- debugging statements - -- Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links - -- Bold { gui = "bold" }, - -- Italic { gui = "italic" }, + Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links + Bold { gui = "bold" }, + Italic { gui = "italic" }, -- ("Ignore", below, may be invisible...) -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| - -- Error { }, -- (preferred) any erroneous construct - - -- Todo { }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo { }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX -- These groups are for the native LSP client. Some other LSP clients may -- use these groups, or use their own. Consult your LSP client's @@ -181,8 +140,8 @@ local theme = lush(function() -- LspReferenceRead { }, -- used for highlighting "read" references -- LspReferenceWrite { }, -- used for highlighting "write" references - -- LspDiagnosticsDefaultError { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - -- LspDiagnosticsDefaultWarning { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultError { Error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning { WarningMsg }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) -- LspDiagnosticsDefaultInformation { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) -- LspDiagnosticsDefaultHint { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) @@ -201,8 +160,8 @@ local theme = lush(function() -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float - -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column - -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column + LspDiagnosticsSignError { fg = Error.fg, bg = CursorLine.bg }, -- Used for "Error" signs in sign column + LspDiagnosticsSignWarning { fg = WarningMsg.fg, bg = CursorLine.bg }, -- Used for "Warning" signs in sign column -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column