From 4fd550de43987fe0f33c6fbfbfdbf257f695317b Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 8 Jan 2025 13:59:38 -0800 Subject: [PATCH] New variants based off different ansi colors --- colors/wombat.vim | 19 ++ colors/wombat_classic.vim | 2 +- colors/wombat_classic_256mod.vim | 19 ++ colors/wombat_lush.vim | 2 +- lua/lush_theme/wombat_classic.lua | 415 ++++++++++++++------------- lua/lush_theme/wombat_lush.lua | 460 +++++++++++++++--------------- lua/wombat/ansi_256mod.lua | 15 + lua/wombat/ansi_iterm.lua | 35 +++ 8 files changed, 533 insertions(+), 434 deletions(-) create mode 100644 colors/wombat.vim create mode 100644 colors/wombat_classic_256mod.vim create mode 100644 lua/wombat/ansi_256mod.lua create mode 100644 lua/wombat/ansi_iterm.lua diff --git a/colors/wombat.vim b/colors/wombat.vim new file mode 100644 index 0000000..aef9629 --- /dev/null +++ b/colors/wombat.vim @@ -0,0 +1,19 @@ +" You probably always want to set this in your vim file +let g:colors_name='wombat' + +" By setting our module to nil, we clear lua's cache, +" which means the require ahead will *always* occur. +" +" This isn't strictly required but it can be a useful trick if you are +" incrementally editing your config a lot and want to be sure your themes +" changes are being picked up without restarting neovim. +" +" Note if you're working in on your theme and have :Lushify'd the buffer, +" your changes will be applied with our without the following line. +" +" The performance impact of this call can be measured in the hundreds of +" *nanoseconds* and such could be considered 'production safe'. +lua package.loaded['lush_theme.lush_template'] = nil + +" include our theme file and pass it to lush to apply +lua require('lush')(require('lush_theme.wombat_lush').with_ansi("ansi_iterm")) diff --git a/colors/wombat_classic.vim b/colors/wombat_classic.vim index 20cc18f..67c16a8 100644 --- a/colors/wombat_classic.vim +++ b/colors/wombat_classic.vim @@ -16,4 +16,4 @@ let g:colors_name='wombat_classic' lua package.loaded['lush_theme.lush_template'] = nil " include our theme file and pass it to lush to apply -lua require('lush')(require('lush_theme.wombat_classic')) +lua require('lush')(require('lush_theme.wombat_classic').with_ansi("ansi_lush")) diff --git a/colors/wombat_classic_256mod.vim b/colors/wombat_classic_256mod.vim new file mode 100644 index 0000000..c7f8a11 --- /dev/null +++ b/colors/wombat_classic_256mod.vim @@ -0,0 +1,19 @@ +" You probably always want to set this in your vim file +let g:colors_name='wombat_classic_256mod' + +" By setting our module to nil, we clear lua's cache, +" which means the require ahead will *always* occur. +" +" This isn't strictly required but it can be a useful trick if you are +" incrementally editing your config a lot and want to be sure your themes +" changes are being picked up without restarting neovim. +" +" Note if you're working in on your theme and have :Lushify'd the buffer, +" your changes will be applied with our without the following line. +" +" The performance impact of this call can be measured in the hundreds of +" *nanoseconds* and such could be considered 'production safe'. +lua package.loaded['lush_theme.lush_template'] = nil + +" include our theme file and pass it to lush to apply +lua require('lush')(require('lush_theme.wombat_classic').with_ansi("ansi_256mod")) diff --git a/colors/wombat_lush.vim b/colors/wombat_lush.vim index 5adea5b..64ca296 100644 --- a/colors/wombat_lush.vim +++ b/colors/wombat_lush.vim @@ -16,4 +16,4 @@ let g:colors_name='wombat_lush' lua package.loaded['lush_theme.lush_template'] = nil " include our theme file and pass it to lush to apply -lua require('lush')(require('lush_theme.wombat_lush')) +lua require('lush')(require('lush_theme.wombat_lush').with_ansi("ansi_lush")) diff --git a/lua/lush_theme/wombat_classic.lua b/lua/lush_theme/wombat_classic.lua index 2fc0c71..63e5a7d 100644 --- a/lua/lush_theme/wombat_classic.lua +++ b/lua/lush_theme/wombat_classic.lua @@ -42,236 +42,241 @@ -- -- `:lua require('lush').ify()` -local lush = require("lush") -local hsl = lush.hsl +local M = {} -local c = require("wombat.colors").from_ansi("ansi_lush") -local italic = "italic" +function M.with_ansi(ansi_colors_name) + local lush = require("lush") + local hsl = lush.hsl --- LSP/Linters mistakenly show `undefined global` errors in the spec, they may --- support an annotation like the following. Consult your server documentation. --- -@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. + local c = require("wombat.colors").from_ansi(ansi_colors_name) + local italic = "italic" - Comment({ fg = c.grey_2, gui = italic }), -- any comment - -- ColorColumn { }, -- used for the columns set with 'colorcolumn' - -- Conceal { }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor({ bg = c.yellow }), -- 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({ Cursor }), -- Screen-column at the cursor, when 'cursorcolumn' is set. - CursorLine({ bg = c.grey_6 }), -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. - Directory({ fg = c.cyan }), -- directory names (and other special names in listings) - DiffAdd({ bg = hsl("#2a0d6a") }), -- diff mode: Added line |diff.txt| - DiffChange({ bg = hsl("#382a37") }), -- diff mode: Changed line |diff.txt| - DiffDelete({ fg = hsl("#242424"), bg = hsl("#3e3969") }), -- diff mode: Deleted line |diff.txt| - DiffText({ bg = hsl("#382a37") }), -- 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 = c.error_red, bg = c.grey_5, gui = "bold" }), -- error messages on the command line - VertSplit({ fg = c.grey_5, bg = c.grey_5 }), -- the column separating vertically split windows - Folded({ fg = c.grey_2, bg = c.grey_4 }), -- line used for closed folds - FoldColumn({ Folded }), -- '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({ fg = c.grey_4, bg = c.black }), -- 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({ fg = c.yellow, bg = c.grey_2, 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| - NonText({ LineNr }), -- '@' 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({ bg = c.dark_bg_256mod, fg = c.dark_fg_256mod }), -- normal text - -- NormalFloat { }, -- Normal text in floating windows. - -- NormalNC { }, -- normal text in non-current windows - Pmenu({ fg = c.bright_yellow, bg = c.grey_5 }), -- Popup menu: normal item. - PmenuSel({ fg = c.bright_green.readable(), bg = c.bright_green }), -- 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({ fg = c.purple, bg = c.grey_3 }), -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - SpecialKey({ fg = c.grey_3, bg = c.grey_6 }), -- 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({ fg = c.bright_yellow, bg = c.grey_5, gui = italic }), -- status line of current window - StatusLineNC({ fg = c.grey_2, bg = StatusLine.bg }), -- 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({ fg = c.bright_yellow, gui = "bold" }), -- titles for output from ":set all", ":autocmd" etc. - Visual({ fg = c.grey_1, bg = c.grey_4 }), -- Visual mode selection - VisualNOS({ fg = c.grey_1, bg = c.grey_5 }), -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg({ fg = c.bright_red }), -- warning messages - -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - -- WildMenu { }, -- current match in 'wildmenu' completion + -- LSP/Linters mistakenly show `undefined global` errors in the spec, they may + -- support an annotation like the following. Consult your server documentation. + -- -@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. - -- These groups are not listed as default vim groups, - -- but they are defacto standard group names for syntax highlighting. - -- commented out groups should chain up to their "preferred" group by - -- default, - -- Uncomment and edit if you want more specific syntax highlighting. + Comment({ fg = c.grey_2, gui = italic }), -- any comment + -- ColorColumn { }, -- used for the columns set with 'colorcolumn' + -- Conceal { }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Cursor({ bg = c.yellow }), -- 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({ Cursor }), -- Screen-column at the cursor, when 'cursorcolumn' is set. + CursorLine({ bg = c.grey_6 }), -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + Directory({ fg = c.cyan }), -- directory names (and other special names in listings) + DiffAdd({ bg = hsl("#2a0d6a") }), -- diff mode: Added line |diff.txt| + DiffChange({ bg = hsl("#382a37") }), -- diff mode: Changed line |diff.txt| + DiffDelete({ fg = hsl("#242424"), bg = hsl("#3e3969") }), -- diff mode: Deleted line |diff.txt| + DiffText({ bg = hsl("#382a37") }), -- 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 = c.error_red, bg = c.grey_5, gui = "bold" }), -- error messages on the command line + VertSplit({ fg = c.grey_5, bg = c.grey_5 }), -- the column separating vertically split windows + Folded({ fg = c.grey_2, bg = c.grey_4 }), -- line used for closed folds + FoldColumn({ Folded }), -- '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({ fg = c.grey_4, bg = c.black }), -- 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({ fg = c.yellow, bg = c.grey_2, 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| + NonText({ LineNr }), -- '@' 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({ bg = c.dark_bg_256mod, fg = c.dark_fg_256mod }), -- normal text + -- NormalFloat { }, -- Normal text in floating windows. + -- NormalNC { }, -- normal text in non-current windows + Pmenu({ fg = c.bright_yellow, bg = c.grey_5 }), -- Popup menu: normal item. + PmenuSel({ fg = c.bright_green.readable(), bg = c.bright_green }), -- 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({ fg = c.purple, bg = c.grey_3 }), -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + SpecialKey({ fg = c.grey_3, bg = c.grey_6 }), -- 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({ fg = c.bright_yellow, bg = c.grey_5, gui = italic }), -- status line of current window + StatusLineNC({ fg = c.grey_2, bg = StatusLine.bg }), -- 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({ fg = c.bright_yellow, gui = "bold" }), -- titles for output from ":set all", ":autocmd" etc. + Visual({ fg = c.grey_1, bg = c.grey_4 }), -- Visual mode selection + VisualNOS({ fg = c.grey_1, bg = c.grey_5 }), -- Visual mode selection when vim is "Not Owning the Selection". + WarningMsg({ fg = c.bright_red }), -- warning messages + -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + -- WildMenu { }, -- current match in 'wildmenu' completion - Constant({ fg = c.orange }), -- (preferred) any constant - String({ fg = c.green, gui = italic }), -- a string constant: "this is a string" - -- Character { }, -- a character constant: 'c', '\n' - Number({ fg = c.orange }), -- a number constant: 234, 0xff - -- Boolean { }, -- a boolean constant: TRUE, false - -- Float { }, -- a floating point constant: 2.3e10 + -- These groups are not listed as default vim groups, + -- but they are defacto standard group names for syntax highlighting. + -- commented out groups should chain up to their "preferred" group by + -- default, + -- Uncomment and edit if you want more specific syntax highlighting. - Identifier({ fg = c.bright_green }), -- (preferred) any variable name - Function({ fg = c.bright_green }), -- function name (also: methods for classes) + Constant({ fg = c.orange }), -- (preferred) any constant + String({ fg = c.green, gui = italic }), -- a string constant: "this is a string" + -- Character { }, -- a character constant: 'c', '\n' + Number({ fg = c.orange }), -- a number constant: 234, 0xff + -- Boolean { }, -- a boolean constant: TRUE, false + -- Float { }, -- a floating point constant: 2.3e10 - Statement({ fg = c.blue }), -- (preferred) any statement - -- Conditional { }, -- if, then, else, endif, switch, etc. - -- Repeat { }, -- for, do, while, etc. - -- Label { }, -- case, default, etc. - -- Operator { }, -- "sizeof", "+", "*", etc. - Keyword({ fg = c.blue }), -- any other keyword - -- Exception { }, -- try, catch, throw + Identifier({ fg = c.bright_green }), -- (preferred) any variable name + Function({ fg = c.bright_green }), -- function name (also: methods for classes) - PreProc({ fg = c.orange }), -- (preferred) generic Preprocessor - -- Include { }, -- preprocessor #include - -- Define { }, -- preprocessor #define - -- Macro { }, -- same as Define - -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. + Statement({ fg = c.blue }), -- (preferred) any statement + -- Conditional { }, -- if, then, else, endif, switch, etc. + -- Repeat { }, -- for, do, while, etc. + -- Label { }, -- case, default, etc. + -- Operator { }, -- "sizeof", "+", "*", etc. + Keyword({ fg = c.blue }), -- any other keyword + -- Exception { }, -- try, catch, throw - Type({ fg = c.yellow }), -- (preferred) int, long, char, etc. - -- StorageClass { }, -- static, register, volatile, etc. - -- Structure { }, -- struct, union, enum, etc. - -- Typedef { }, -- A typedef + PreProc({ fg = c.orange }), -- (preferred) generic Preprocessor + -- Include { }, -- preprocessor #include + -- Define { }, -- preprocessor #define + -- Macro { }, -- same as Define + -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Special({ fg = c.yellow }), -- (preferred) any special symbol - -- SpecialChar { }, -- special character in a constant - -- Tag { }, -- you can use CTRL-] on this - -- Delimiter { Special }, -- character that needs attention - -- SpecialComment { }, -- special things inside a comment - -- Debug { }, -- debugging statements + Type({ fg = c.yellow }), -- (preferred) int, long, char, etc. + -- StorageClass { }, -- static, register, volatile, etc. + -- Structure { }, -- struct, union, enum, etc. + -- Typedef { }, -- A typedef - -- Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links - -- Bold { gui = "bold" }, - -- Italic { gui = "italic" }, + Special({ fg = c.yellow }), -- (preferred) any special symbol + -- SpecialChar { }, -- special character in a constant + -- Tag { }, -- you can use CTRL-] on this + -- Delimiter { Special }, -- character that needs attention + -- SpecialComment { }, -- special things inside a comment + -- Debug { }, -- debugging statements - -- ("Ignore", below, may be invisible...) - -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| + -- Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links + -- Bold { gui = "bold" }, + -- Italic { gui = "italic" }, - -- Error { }, -- (preferred) any erroneous construct + -- ("Ignore", below, may be invisible...) + -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| - Todo({ fg = c.grey_3, gui = italic }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + -- Error { }, -- (preferred) any erroneous construct - -- 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 - -- documentation. + Todo({ fg = c.grey_3, gui = italic }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - -- LspReferenceText { }, -- used for highlighting "text" references - -- LspReferenceRead { }, -- used for highlighting "read" references - -- LspReferenceWrite { }, -- used for highlighting "write" references + -- 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 + -- documentation. - -- 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) - -- 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) + -- LspReferenceText { }, -- used for highlighting "text" references + -- LspReferenceRead { }, -- used for highlighting "read" references + -- LspReferenceWrite { }, -- used for highlighting "write" references - -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text - -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text - -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text - -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text + -- 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) + -- 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) - -- LspDiagnosticsUnderlineError { }, -- Used to underline "Error" diagnostics - -- LspDiagnosticsUnderlineWarning { }, -- Used to underline "Warning" diagnostics - -- LspDiagnosticsUnderlineInformation { }, -- Used to underline "Information" diagnostics - -- LspDiagnosticsUnderlineHint { }, -- Used to underline "Hint" diagnostics + -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text + -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text + -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text + -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text - -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float + -- LspDiagnosticsUnderlineError { }, -- Used to underline "Error" diagnostics + -- LspDiagnosticsUnderlineWarning { }, -- Used to underline "Warning" diagnostics + -- LspDiagnosticsUnderlineInformation { }, -- Used to underline "Information" diagnostics + -- LspDiagnosticsUnderlineHint { }, -- Used to underline "Hint" diagnostics - -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column - -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column - -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column - -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column + -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float - -- LspCodeLens { }, -- Used to color the virtual text of the codelens + -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column + -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column + -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column + -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column - -- These groups are for the neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - -- By default, most of these groups link to an appropriate Vim group, - -- TSError -> Error for example, so you do not have to define these unless - -- you explicitly want to support Treesitter's improved syntax awareness. + -- LspCodeLens { }, -- Used to color the virtual text of the codelens - -- TSAnnotation { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. - -- TSAttribute { }; -- (unstable) TODO: docs - -- TSBoolean { }; -- For booleans. - -- TSCharacter { }; -- For characters. - -- TSComment { }; -- For comment blocks. - -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. - -- TSConditional { }; -- For keywords related to conditionnals. - -- TSConstant { }; -- For constants - -- TSConstBuiltin { }; -- For constant that are built in the language: `nil` in Lua. - -- TSConstMacro { }; -- For constants that are defined by macros: `NULL` in C. - -- TSError { }; -- For syntax/parser errors. - -- TSException { }; -- For exception related keywords. - -- TSField { }; -- For fields. - -- TSFloat { }; -- For floats. - -- TSFunction { }; -- For function (calls and definitions). - -- TSFuncBuiltin { }; -- For builtin functions: `table.insert` in Lua. - -- TSFuncMacro { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. - -- TSInclude { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. - -- TSKeyword { }; -- For keywords that don't fall in previous categories. - -- TSKeywordFunction { }; -- For keywords used to define a fuction. - -- TSLabel { }; -- For labels: `label:` in C and `:label:` in Lua. - -- TSMethod { }; -- For method calls and definitions. - -- TSNamespace { }; -- For identifiers referring to modules and namespaces. - -- TSNone { }; -- TODO: docs - -- TSNumber { }; -- For all numbers - -- TSOperator { }; -- For any operator: `+`, but also `->` and `*` in C. - -- TSParameter { }; -- For parameters of a function. - -- TSParameterReference { }; -- For references to parameters of a function. - -- TSProperty { }; -- Same as `TSField`. - -- TSPunctDelimiter { }; -- For delimiters ie: `.` - -- TSPunctBracket { }; -- For brackets and parens. - -- TSPunctSpecial { }; -- For special punctutation that does not fall in the catagories before. - -- TSRepeat { }; -- For keywords related to loops. - -- TSString { }; -- For strings. - -- TSStringRegex { }; -- For regexes. - -- TSStringEscape { }; -- For escape characters within a string. - -- TSSymbol { }; -- For identifiers referring to symbols or atoms. - -- TSType { }; -- For types. - -- TSTypeBuiltin { }; -- For builtin types. - -- TSVariable { }; -- Any variable name that does not have another highlight. - -- TSVariableBuiltin { }; -- Variable names that are defined by the languages, like `this` or `self`. + -- These groups are for the neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + -- By default, most of these groups link to an appropriate Vim group, + -- TSError -> Error for example, so you do not have to define these unless + -- you explicitly want to support Treesitter's improved syntax awareness. - -- TSTag { }; -- Tags like html tag names. - -- TSTagDelimiter { }; -- Tag delimiter like `<` `>` `/` - -- TSText { }; -- For strings considered text in a markup language. - -- TSEmphasis { }; -- For text to be represented with emphasis. - -- TSUnderline { }; -- For text to be represented with an underline. - -- TSStrike { }; -- For strikethrough text. - -- TSTitle { }; -- Text that is part of a title. - -- TSLiteral { }; -- Literal text. - -- TSURI { }; -- Any URI like a link or email. - } -end) + -- TSAnnotation { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. + -- TSAttribute { }; -- (unstable) TODO: docs + -- TSBoolean { }; -- For booleans. + -- TSCharacter { }; -- For characters. + -- TSComment { }; -- For comment blocks. + -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. + -- TSConditional { }; -- For keywords related to conditionnals. + -- TSConstant { }; -- For constants + -- TSConstBuiltin { }; -- For constant that are built in the language: `nil` in Lua. + -- TSConstMacro { }; -- For constants that are defined by macros: `NULL` in C. + -- TSError { }; -- For syntax/parser errors. + -- TSException { }; -- For exception related keywords. + -- TSField { }; -- For fields. + -- TSFloat { }; -- For floats. + -- TSFunction { }; -- For function (calls and definitions). + -- TSFuncBuiltin { }; -- For builtin functions: `table.insert` in Lua. + -- TSFuncMacro { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. + -- TSInclude { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. + -- TSKeyword { }; -- For keywords that don't fall in previous categories. + -- TSKeywordFunction { }; -- For keywords used to define a fuction. + -- TSLabel { }; -- For labels: `label:` in C and `:label:` in Lua. + -- TSMethod { }; -- For method calls and definitions. + -- TSNamespace { }; -- For identifiers referring to modules and namespaces. + -- TSNone { }; -- TODO: docs + -- TSNumber { }; -- For all numbers + -- TSOperator { }; -- For any operator: `+`, but also `->` and `*` in C. + -- TSParameter { }; -- For parameters of a function. + -- TSParameterReference { }; -- For references to parameters of a function. + -- TSProperty { }; -- Same as `TSField`. + -- TSPunctDelimiter { }; -- For delimiters ie: `.` + -- TSPunctBracket { }; -- For brackets and parens. + -- TSPunctSpecial { }; -- For special punctutation that does not fall in the catagories before. + -- TSRepeat { }; -- For keywords related to loops. + -- TSString { }; -- For strings. + -- TSStringRegex { }; -- For regexes. + -- TSStringEscape { }; -- For escape characters within a string. + -- TSSymbol { }; -- For identifiers referring to symbols or atoms. + -- TSType { }; -- For types. + -- TSTypeBuiltin { }; -- For builtin types. + -- TSVariable { }; -- Any variable name that does not have another highlight. + -- TSVariableBuiltin { }; -- Variable names that are defined by the languages, like `this` or `self`. --- return our parsed theme for extension or use else where. -return theme + -- TSTag { }; -- Tags like html tag names. + -- TSTagDelimiter { }; -- Tag delimiter like `<` `>` `/` + -- TSText { }; -- For strings considered text in a markup language. + -- TSEmphasis { }; -- For text to be represented with emphasis. + -- TSUnderline { }; -- For text to be represented with an underline. + -- TSStrike { }; -- For strikethrough text. + -- TSTitle { }; -- Text that is part of a title. + -- TSLiteral { }; -- Literal text. + -- TSURI { }; -- Any URI like a link or email. + } + end) + -- return our parsed theme for extension or use else where. + return theme +end + +return M -- vi:nowrap diff --git a/lua/lush_theme/wombat_lush.lua b/lua/lush_theme/wombat_lush.lua index 49bba87..7677f22 100644 --- a/lua/lush_theme/wombat_lush.lua +++ b/lua/lush_theme/wombat_lush.lua @@ -42,260 +42,266 @@ -- -- `:lua require('lush').ify()` -local lush = require("lush") +local M = {} -local c = require("wombat.colors").from_ansi("ansi_lush") -local classic = require("lush_theme.wombat_classic") +function M.with_ansi(ansi_colors_name) + local lush = require("lush") --- LSP/Linters mistakenly show `undefined global` errors in the spec, they may --- support an annotation li --- luacheck: ignore --- @diagnostic disable: undefined-global -local theme = lush.extends({ classic }).with(function(injected_functions) - local sym = injected_functions.sym - 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. + local c = require("wombat.colors").from_ansi(ansi_colors_name) + local classic = require("lush_theme.wombat_classic") - -- Comment { fg = c.grey_2, gui = italic }, -- any comment - -- ColorColumn { }, -- used for the columns set with 'colorcolumn' - -- Conceal { }, -- placeholder characters substituted for concealed text (see 'conceallevel') - -- Cursor { bg = c.yellow }, -- 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 { Cursor }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - -- CursorLine { bg = c.grey_6}, -- 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({ fg = c.dark_green.readable(), bg = c.dark_green }), -- diff mode: Added line |diff.txt| - DiffChange({ bg = c.violet }), -- diff mode: Changed line |diff.txt| - DiffDelete({ fg = c.red.readable(), bg = c.red }), -- diff mode: Deleted line |diff.txt| - DiffText({ fg = c.magenta.readable(), bg = c.magenta }), -- 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 = c.error_red, bg = c.grey_5, gui = "bold" }, -- error messages on the command line - -- VertSplit { fg = c.grey_5, bg = c.grey_5 }, -- the column separating vertically split windows - -- Folded { fg = c.grey_2, bg = c.grey_4 }, -- line used for closed folds - -- FoldColumn { Folded }, -- '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 { fg = c.grey_4, bg = c.black }, -- 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 { fg = c.yellow, bg = c.grey_2, 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| - -- NonText { LineNr }, -- '@' 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({ bg = c.dark_bg, fg = c.dark_fg }), -- normal text - NormalFloat({ bg = Normal.bg.lighten(10), fg = classic.Special.fg }), -- Normal text in floating windows. - FloatBorder({ bg = NormalFloat.bg, fg = classic.Pmenu.fg }), -- float border - -- NormalNC { }, -- normal text in non-current windows - -- Pmenu { fg = c.light_yellow, bg = c.grey_5 }, -- Popup menu: normal item. - -- PmenuSel { fg = c.bright_green.readable(), bg = c.green }, -- 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 { fg = c.purple, bg = c.grey_3 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - -- SpecialKey { fg = c.grey_3, bg = c.grey_6 }, -- 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 { fg = c.light_yellow, bg = c.grey_5, gui = italic }, -- status line of current window - -- StatusLineNC { fg = c.grey_2, bg = StatusLine.bg }, -- 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 { fg = c.light_yellow, gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. - -- Visual { fg = c.grey_1, bg = c.grey_4 }, -- Visual mode selection - -- VisualNOS { fg = c.grey_1, bg = c.grey_5 }, -- Visual mode selection when vim is "Not Owning the Selection". - -- WarningMsg { fg = c.bright_red }, -- warning messages - -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - -- WildMenu { }, -- current match in 'wildmenu' completion + -- LSP/Linters mistakenly show `undefined global` errors in the spec, they may + -- support an annotation li + -- luacheck: ignore + -- @diagnostic disable: undefined-global + local theme = lush.extends({ classic }).with(function(injected_functions) + local sym = injected_functions.sym + 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. - -- These groups are not listed as default vim groups, - -- but they are defacto standard group names for syntax highlighting. - -- commented out groups should chain up to their "preferred" group by - -- default, - -- Uncomment and edit if you want more specific syntax highlighting. + -- Comment { fg = c.grey_2, gui = italic }, -- any comment + -- ColorColumn { }, -- used for the columns set with 'colorcolumn' + -- Conceal { }, -- placeholder characters substituted for concealed text (see 'conceallevel') + -- Cursor { bg = c.yellow }, -- 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 { Cursor }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + -- CursorLine { bg = c.grey_6}, -- 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({ fg = c.dark_green.readable(), bg = c.dark_green }), -- diff mode: Added line |diff.txt| + DiffChange({ bg = c.violet }), -- diff mode: Changed line |diff.txt| + DiffDelete({ fg = c.red.readable(), bg = c.red }), -- diff mode: Deleted line |diff.txt| + DiffText({ fg = c.magenta.readable(), bg = c.magenta }), -- 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 = c.error_red, bg = c.grey_5, gui = "bold" }, -- error messages on the command line + -- VertSplit { fg = c.grey_5, bg = c.grey_5 }, -- the column separating vertically split windows + -- Folded { fg = c.grey_2, bg = c.grey_4 }, -- line used for closed folds + -- FoldColumn { Folded }, -- '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 { fg = c.grey_4, bg = c.black }, -- 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 { fg = c.yellow, bg = c.grey_2, 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| + -- NonText { LineNr }, -- '@' 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({ bg = c.dark_bg, fg = c.dark_fg }), -- normal text + NormalFloat({ bg = Normal.bg.lighten(10), fg = classic.Special.fg }), -- Normal text in floating windows. + FloatBorder({ bg = NormalFloat.bg, fg = classic.Pmenu.fg }), -- float border + -- NormalNC { }, -- normal text in non-current windows + -- Pmenu { fg = c.light_yellow, bg = c.grey_5 }, -- Popup menu: normal item. + -- PmenuSel { fg = c.bright_green.readable(), bg = c.green }, -- 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 { fg = c.purple, bg = c.grey_3 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + -- SpecialKey { fg = c.grey_3, bg = c.grey_6 }, -- 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 { fg = c.light_yellow, bg = c.grey_5, gui = italic }, -- status line of current window + -- StatusLineNC { fg = c.grey_2, bg = StatusLine.bg }, -- 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 { fg = c.light_yellow, gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. + -- Visual { fg = c.grey_1, bg = c.grey_4 }, -- Visual mode selection + -- VisualNOS { fg = c.grey_1, bg = c.grey_5 }, -- Visual mode selection when vim is "Not Owning the Selection". + -- WarningMsg { fg = c.bright_red }, -- warning messages + -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + -- WildMenu { }, -- current match in 'wildmenu' completion - -- Constant { fg = c.orange }, -- (preferred) any constant - -- String { fg = c.green, gui = italic }, -- a string constant: "this is a string" - -- Character { }, -- a character constant: 'c', '\n' - -- Number { fg = c.orange }, -- a number constant: 234, 0xff - Boolean({ fg = c.bright_red }), -- a boolean constant: TRUE, false - Float({ classic.Number }), -- a floating point constant: 2.3e10 + -- These groups are not listed as default vim groups, + -- but they are defacto standard group names for syntax highlighting. + -- commented out groups should chain up to their "preferred" group by + -- default, + -- Uncomment and edit if you want more specific syntax highlighting. - -- Identifier { classic.Identifier }, -- (preferred) any variable name - -- Function { classic.Function }, -- function name (also: methods for classes) + -- Constant { fg = c.orange }, -- (preferred) any constant + -- String { fg = c.green, gui = italic }, -- a string constant: "this is a string" + -- Character { }, -- a character constant: 'c', '\n' + -- Number { fg = c.orange }, -- a number constant: 234, 0xff + Boolean({ fg = c.bright_red }), -- a boolean constant: TRUE, false + Float({ classic.Number }), -- a floating point constant: 2.3e10 - -- Statement { fg = c.purple }, -- (preferred) any statement - Conditional({ classic.Statement }), -- if, then, else, endif, switch, etc. - Repeat({ classic.Statement }), -- for, do, while, etc. - Label({ fg = c.magenta }), -- case, default, etc. - Operator({ fg = c.magenta }), -- "sizeof", "+", "*", etc. - -- Keyword { classic.Keyword }, -- any other keyword - Exception({ fg = c.orange }), -- try, catch, throw + -- Identifier { classic.Identifier }, -- (preferred) any variable name + -- Function { classic.Function }, -- function name (also: methods for classes) - -- PreProc { fg = c.orange }, -- (preferred) generic Preprocessor - -- Include { }, -- preprocessor #include - -- Define { }, -- preprocessor #define - -- Macro { }, -- same as Define - -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. + -- Statement { fg = c.purple }, -- (preferred) any statement + Conditional({ classic.Statement }), -- if, then, else, endif, switch, etc. + Repeat({ classic.Statement }), -- for, do, while, etc. + Label({ fg = c.magenta }), -- case, default, etc. + Operator({ fg = c.magenta }), -- "sizeof", "+", "*", etc. + -- Keyword { classic.Keyword }, -- any other keyword + Exception({ fg = c.orange }), -- try, catch, throw - -- Type { classic.Type }, -- (preferred) int, long, char, etc. - -- StorageClass { }, -- static, register, volatile, etc. - -- Structure { }, -- struct, union, enum, etc. - -- Typedef { }, -- A typedef + -- PreProc { fg = c.orange }, -- (preferred) generic Preprocessor + -- Include { }, -- preprocessor #include + -- Define { }, -- preprocessor #define + -- Macro { }, -- same as Define + -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - -- Special { classic.Special }, -- (preferred) any special symbol - -- SpecialChar { }, -- special character in a constant - -- Tag { }, -- you can use CTRL-] on this - Delimiter({ fg = c.purple }), -- character that needs attention - -- SpecialComment { }, -- special things inside a comment - -- Debug { }, -- debugging statements + -- Type { classic.Type }, -- (preferred) int, long, char, etc. + -- StorageClass { }, -- static, register, volatile, etc. + -- Structure { }, -- struct, union, enum, etc. + -- Typedef { }, -- A typedef - -- Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links - -- Bold { gui = "bold" }, - -- Italic { gui = "italic" }, + -- Special { classic.Special }, -- (preferred) any special symbol + -- SpecialChar { }, -- special character in a constant + -- Tag { }, -- you can use CTRL-] on this + Delimiter({ fg = c.purple }), -- character that needs attention + -- SpecialComment { }, -- special things inside a comment + -- Debug { }, -- debugging statements - -- ("Ignore", below, may be invisible...) - -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| + -- Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links + -- Bold { gui = "bold" }, + -- Italic { gui = "italic" }, - -- Error { }, -- (preferred) any erroneous construct + -- ("Ignore", below, may be invisible...) + -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| - -- Todo { fg = c.grey_3, gui = italic }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + -- Error { }, -- (preferred) any erroneous construct - -- 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 - -- documentation. + -- Todo { fg = c.grey_3, gui = italic }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - -- LspReferenceText { }, -- used for highlighting "text" references - -- LspReferenceRead { }, -- used for highlighting "read" references - -- LspReferenceWrite { }, -- used for highlighting "write" references + -- 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 + -- documentation. - -- 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) - -- 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) + -- LspReferenceText { }, -- used for highlighting "text" references + -- LspReferenceRead { }, -- used for highlighting "read" references + -- LspReferenceWrite { }, -- used for highlighting "write" references - -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text - -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text - -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text - -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text + -- 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) + -- 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) - -- LspDiagnosticsUnderlineError { }, -- Used to underline "Error" diagnostics - -- LspDiagnosticsUnderlineWarning { }, -- Used to underline "Warning" diagnostics - -- LspDiagnosticsUnderlineInformation { }, -- Used to underline "Information" diagnostics - -- LspDiagnosticsUnderlineHint { }, -- Used to underline "Hint" diagnostics + -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text + -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text + -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text + -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text - -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float + -- LspDiagnosticsUnderlineError { }, -- Used to underline "Error" diagnostics + -- LspDiagnosticsUnderlineWarning { }, -- Used to underline "Warning" diagnostics + -- LspDiagnosticsUnderlineInformation { }, -- Used to underline "Information" diagnostics + -- LspDiagnosticsUnderlineHint { }, -- Used to underline "Hint" diagnostics - -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column - -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column - -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column - -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column + -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float - -- LspCodeLens { }, -- Used to color the virtual text of the codelens + -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column + -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column + -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column + -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column - -- These groups are for the neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - -- By default, most of these groups link to an appropriate Vim group, - -- TSError -> Error for example, so you do not have to define these unless - -- you explicitly want to support Treesitter's improved syntax awareness. + -- LspCodeLens { }, -- Used to color the virtual text of the codelens - -- TSAnnotation { }, -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. - -- TSAttribute { }, -- (unstable) TODO: docs - -- TSBoolean { }, -- For booleans. - -- TSCharacter { }, -- For characters. - -- TSComment { }, -- For comment blocks. - -- TSConstructor { }, -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. - -- TSConditional { }, -- For keywords related to conditionnals. - -- TSConstant { }, -- For constants - -- TSConstBuiltin { }, -- For constant that are built in the language: `nil` in Lua. - -- TSConstMacro { }, -- For constants that are defined by macros: `NULL` in C. - -- TSError { }, -- For syntax/parser errors. - -- TSException { }, -- For exception related keywords. - -- TSField { }, -- For fields. - -- TSFloat { }, -- For floats. - TSFunction({ classic.Function }), -- For function (calls and definitions). - -- TSFuncBuiltin { }, -- For builtin functions: `table.insert` in Lua. - -- TSFuncMacro { }, -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. - -- TSInclude { }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. - TSKeyword({ classic.Keyword }), -- For keywords that don't fall in previous categories. - -- TSKeywordFunction { }, -- For keywords used to define a fuction. - -- TSLabel { }, -- For labels: `label:` in C and `:label:` in Lua. - TSMethod({ classic.Function }), -- For method calls and definitions. - -- TSNamespace { }, -- For identifiers referring to modules and namespaces. - -- TSNone { }, -- TODO: docs - -- TSNumber { }, -- For all numbers - -- TSOperator { }, -- For any operator: `+`, but also `->` and `*` in C. - -- TSParameter { }, -- For parameters of a function. - -- TSParameterReference { }, -- For references to parameters of a function. - TSProperty({ classic.Identifier }), -- Same as `TSField`. - -- TSPunctDelimiter { }, -- For delimiters ie: `.` - -- TSPunctBracket { }, -- For brackets and parens. - -- TSPunctSpecial { }, -- For special punctutation that does not fall in the catagories before. - -- TSRepeat { }, -- For keywords related to loops. - -- TSString { }, -- For strings. - -- TSStringRegex { }, -- For regexes. - -- TSStringEscape { }, -- For escape characters within a string. - -- TSSymbol { }, -- For identifiers referring to symbols or atoms. - TSType({ classic.Type }), -- For types. - -- TSTypeBuiltin { }, -- For builtin types. - TSVariable({ classic.Special }), -- Any variable name that does not have another highlight. - -- TSVariableBuiltin { }, -- Variable names that are defined by the languages, like `this` or `self`. + -- These groups are for the neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + -- By default, most of these groups link to an appropriate Vim group, + -- TSError -> Error for example, so you do not have to define these unless + -- you explicitly want to support Treesitter's improved syntax awareness. - -- TSTag { }, -- Tags like html tag names. - -- TSTagDelimiter { }, -- Tag delimiter like `<` `>` `/` - TSText({ fg = Normal.fg }), -- For strings considered text in a markup language. - -- TSEmphasis { }, -- For text to be represented with emphasis. - -- TSUnderline { }, -- For text to be represented with an underline. - -- TSStrike { }, -- For strikethrough text. - -- TSTitle { }, -- Text that is part of a title. - -- TSLiteral { }, -- Literal text. - -- TSURI { }, -- Any URI like a link or email. + -- TSAnnotation { }, -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. + -- TSAttribute { }, -- (unstable) TODO: docs + -- TSBoolean { }, -- For booleans. + -- TSCharacter { }, -- For characters. + -- TSComment { }, -- For comment blocks. + -- TSConstructor { }, -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. + -- TSConditional { }, -- For keywords related to conditionnals. + -- TSConstant { }, -- For constants + -- TSConstBuiltin { }, -- For constant that are built in the language: `nil` in Lua. + -- TSConstMacro { }, -- For constants that are defined by macros: `NULL` in C. + -- TSError { }, -- For syntax/parser errors. + -- TSException { }, -- For exception related keywords. + -- TSField { }, -- For fields. + -- TSFloat { }, -- For floats. + TSFunction({ classic.Function }), -- For function (calls and definitions). + -- TSFuncBuiltin { }, -- For builtin functions: `table.insert` in Lua. + -- TSFuncMacro { }, -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. + -- TSInclude { }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. + TSKeyword({ classic.Keyword }), -- For keywords that don't fall in previous categories. + -- TSKeywordFunction { }, -- For keywords used to define a fuction. + -- TSLabel { }, -- For labels: `label:` in C and `:label:` in Lua. + TSMethod({ classic.Function }), -- For method calls and definitions. + -- TSNamespace { }, -- For identifiers referring to modules and namespaces. + -- TSNone { }, -- TODO: docs + -- TSNumber { }, -- For all numbers + -- TSOperator { }, -- For any operator: `+`, but also `->` and `*` in C. + -- TSParameter { }, -- For parameters of a function. + -- TSParameterReference { }, -- For references to parameters of a function. + TSProperty({ classic.Identifier }), -- Same as `TSField`. + -- TSPunctDelimiter { }, -- For delimiters ie: `.` + -- TSPunctBracket { }, -- For brackets and parens. + -- TSPunctSpecial { }, -- For special punctutation that does not fall in the catagories before. + -- TSRepeat { }, -- For keywords related to loops. + -- TSString { }, -- For strings. + -- TSStringRegex { }, -- For regexes. + -- TSStringEscape { }, -- For escape characters within a string. + -- TSSymbol { }, -- For identifiers referring to symbols or atoms. + TSType({ classic.Type }), -- For types. + -- TSTypeBuiltin { }, -- For builtin types. + TSVariable({ classic.Special }), -- Any variable name that does not have another highlight. + -- TSVariableBuiltin { }, -- Variable names that are defined by the languages, like `this` or `self`. - -- Link all uncommented TS values to their semantic equivalents - sym("@function")({ TSFunction }), - sym("@keyword")({ TSKeyword }), - sym("@method")({ TSMethod }), - sym("@property")({ TSProperty }), - sym("@type")({ TSType }), - sym("@variable")({ TSVariable }), - sym("@text")({ TSText }), + -- TSTag { }, -- Tags like html tag names. + -- TSTagDelimiter { }, -- Tag delimiter like `<` `>` `/` + TSText({ fg = Normal.fg }), -- For strings considered text in a markup language. + -- TSEmphasis { }, -- For text to be represented with emphasis. + -- TSUnderline { }, -- For text to be represented with an underline. + -- TSStrike { }, -- For strikethrough text. + -- TSTitle { }, -- Text that is part of a title. + -- TSLiteral { }, -- Literal text. + -- TSURI { }, -- Any URI like a link or email. - -- cmp highlights - CmpItemAbbrDeprecated({ fg = c.bright_green, gui = "strikethrough" }), - CmpItemAbbrMatch({ fg = c.bright_green }), - CmpItemAbbrMatchFuzzy({ CmpItemAbbrMatch }), - CmpItemKindVariable({ TSVariable }), - CmpItemKindInterface({ TSType }), - CmpItemKindText({ TSText }), - CmpItemKindFunction({ TSFunction }), - CmpItemKindMethod({ TSMethod }), - CmpItemKindKeyword({ TSKeyword }), - CmpItemKindProperty({ TSProperty }), - -- CmpItemKindUnit { Normal }, - } -end) + -- Link all uncommented TS values to their semantic equivalents + sym("@function")({ TSFunction }), + sym("@keyword")({ TSKeyword }), + sym("@method")({ TSMethod }), + sym("@property")({ TSProperty }), + sym("@type")({ TSType }), + sym("@variable")({ TSVariable }), + sym("@text")({ TSText }), --- return our parsed theme for extension or use else where. -return theme + -- cmp highlights + CmpItemAbbrDeprecated({ fg = c.bright_green, gui = "strikethrough" }), + CmpItemAbbrMatch({ fg = c.bright_green }), + CmpItemAbbrMatchFuzzy({ CmpItemAbbrMatch }), + CmpItemKindVariable({ TSVariable }), + CmpItemKindInterface({ TSType }), + CmpItemKindText({ TSText }), + CmpItemKindFunction({ TSFunction }), + CmpItemKindMethod({ TSMethod }), + CmpItemKindKeyword({ TSKeyword }), + CmpItemKindProperty({ TSProperty }), + -- CmpItemKindUnit { Normal }, + } + end) + + -- return our parsed theme for extension or use else where. + return theme +end + +return M -- vi:nowrap diff --git a/lua/wombat/ansi_256mod.lua b/lua/wombat/ansi_256mod.lua new file mode 100644 index 0000000..283da38 --- /dev/null +++ b/lua/wombat/ansi_256mod.lua @@ -0,0 +1,15 @@ +-- Define the base color palet for wombat +local lush = require("lush") +local hsl = lush.hsl + +-- Modify my lush colors with a few tweaks to match the old 256mod colors +local M = require("wombat.ansi_lush") + +M.blue = hsl("#88b8f6") + +M.bright_green = hsl("#cae982") + +M.foreground = hsl("#e3e0d7") +M.background = hsl("#242424") + +return M diff --git a/lua/wombat/ansi_iterm.lua b/lua/wombat/ansi_iterm.lua new file mode 100644 index 0000000..cc4f49e --- /dev/null +++ b/lua/wombat/ansi_iterm.lua @@ -0,0 +1,35 @@ +-- Define the base color palet for wombat +local lush = require("lush") +local hsl = lush.hsl + +local M = {} + +-- ANSI terminal colors +M.black = hsl("#000000") +M.red = hsl("#ff615a") +M.green = hsl("#b1e969") +M.yellow = hsl("#ebd99c") +M.blue = hsl("#5da9f6") +M.magenta = hsl("#e86aff") +M.cyan = hsl("#82fff7") +M.white = hsl("#dedacf") + +M.bright_black = hsl("#313131") +M.bright_red = hsl("#f58c80") +M.bright_green = hsl("#ddf88f") +M.bright_yellow = hsl("#eee5b2") +M.bright_blue = hsl("#a5c7ff") +M.bright_magenta = hsl("#ddaaff") +M.bright_cyan = hsl("#b7fff9") +M.bright_white = hsl("#ffffff") + +M.foreground = hsl("#dedacf") +M.background = hsl("#171717") + +M.cursor = hsl("#bbbbbb") +M.cursor_text = hsl("#ffffff") + +M.selection_background = hsl("#453b39") +M.selection_foreground = hsl("#b6bbc0") + +return M