From d92d8b2fa0acdb898b842b7199483ead53fc7eb2 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Mon, 27 Sep 2021 17:43:57 -0700 Subject: [PATCH] Split classic wombat and start building a more lush wombat --- colors/wombat_lush_classic.vim | 20 ++ lua/lush_theme/wombat_lush.lua | 124 ++++------- lua/lush_theme/wombat_lush_classic.lua | 278 +++++++++++++++++++++++++ lua/lush_theme/wombat_lush_colors.lua | 56 +++++ 4 files changed, 397 insertions(+), 81 deletions(-) create mode 100644 colors/wombat_lush_classic.vim create mode 100644 lua/lush_theme/wombat_lush_classic.lua create mode 100644 lua/lush_theme/wombat_lush_colors.lua diff --git a/colors/wombat_lush_classic.vim b/colors/wombat_lush_classic.vim new file mode 100644 index 0000000..1ec6e42 --- /dev/null +++ b/colors/wombat_lush_classic.vim @@ -0,0 +1,20 @@ +" You probably always want to set this in your vim file +set background=dark +let g:colors_name='wombat_lush_classic' + +" 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_classic')) diff --git a/lua/lush_theme/wombat_lush.lua b/lua/lush_theme/wombat_lush.lua index 118f94a..23f3bd0 100644 --- a/lua/lush_theme/wombat_lush.lua +++ b/lua/lush_theme/wombat_lush.lua @@ -45,46 +45,8 @@ local lush = require('lush') local hsl = lush.hsl --- My pallet -local black = hsl("#000000") -local red = hsl("#ff786c") -local darkred = red.darken(10) -local green = hsl("#bde97c") -- 256mod #cae982 -local bright_green = hsl("#95e454") -local darkgreen = green.darken(10) -local yellow = hsl("#efdeab") -local light_yellow = hsl("#ffffd7") -local darkyellow = yellow.darken(10) -local blue = hsl("#6eb9f8") -- 256mod #88b8f6 -local darkblue = blue.darken(10) -local magenta = hsl("#ee87ff") -local darkmagenta = magenta.darken(10) -local cyan = hsl("#90fdf8") -local darkcyan = cyan.darken(10) -local white = hsl("#e4e0d7") - -local orange = hsl("#e5786d") -local darkorange = orange.darken(10) -local purple = hsl("#d787ff") -local violet = hsl("#b294bb") -local grey = hsl("#574b49") -local aqua = cyan -local pink = red.lighten(10) - --- A few grey scales -local grey_1 = hsl("#c3c6ca") -local grey_2 = hsl("#9c998e") -local grey_3 = hsl("#636066") -local grey_4 = hsl("#574b49") -local grey_5 = hsl("#444444") -local grey_6 = hsl("#32322f") - --- Other colors -local error_red = hsl("#ff2026") - --- Set some fg/bg colors -local dark_fg = hsl("#e4e0d7") -- 246mod = #e3e0d7 -local dark_bg = hsl("#1e1e1e") -- 256mod = #242424 +local c = require("lush_theme.wombat_lush_colors").colors +local italic = require("lush_theme.wombat_lush_colors").italic -- LSP/Linters mistakenly show `undefined global` errors in the spec, they may -- support an annotation like the following. Consult your server documentation. @@ -103,61 +65,61 @@ local theme = lush(function() -- styling for that group (meaning they mostly get styled as Normal) -- or leave them commented to apply vims default colouring or linking. - Comment { fg = grey_2, gui = "italic" }, -- any comment + 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 = yellow }, -- character under the cursor + 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 = grey_6}, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not 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 = darkgreen.readable(), bg = darkgreen }, -- diff mode: Added line |diff.txt| - DiffChange { bg = violet }, -- diff mode: Changed line |diff.txt| - DiffDelete { fg = darkred.readable(), bg = darkred }, -- diff mode: Deleted line |diff.txt| - DiffText { fg = magenta.readable(), bg = magenta }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { fg = c.darkgreen.readable(), bg = c.darkgreen }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.violet }, -- diff mode: Changed line |diff.txt| + DiffDelete { fg = c.darkred.readable(), bg = c.darkred }, -- 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 = error_red, bg = grey_5, gui = "bold" }, -- error messages on the command line - VertSplit { fg = grey_5, bg = grey_5 }, -- the column separating vertically split windows - Folded { fg = grey_2, bg = grey_4 }, -- line used for closed folds + 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 = grey_4, bg = black }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + 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 = yellow, bg = 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| + 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 = dark_bg, fg = dark_fg}, -- normal text + Normal {bg = c.dark_bg, fg = c.dark_fg}, -- normal text -- NormalFloat { }, -- Normal text in floating windows. -- NormalNC { }, -- normal text in non-current windows - Pmenu { fg = light_yellow, bg = grey_5 }, -- Popup menu: normal item. - PmenuSel { fg = green.readable(), bg = green }, -- Popup menu: selected item. + Pmenu { fg = c.light_yellow, bg = c.grey_5 }, -- Popup menu: normal item. + PmenuSel { fg = c.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 = purple, bg = grey_3 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - SpecialKey { fg = grey_3, bg = grey_6 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + 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 = light_yellow, bg = grey_5, gui = "italic" }, -- status line of current window - StatusLineNC { fg = 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. + 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 = light_yellow, gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. - Visual { fg = grey_1, bg = grey_4 }, -- Visual mode selection - VisualNOS { fg = grey_1, bg = grey_5 }, -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg { fg = red }, -- warning messages + 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.red }, -- warning messages -- Whitespace { }, -- "nbsp", "space", "tab" and "trail" in 'listchars' -- WildMenu { }, -- current match in 'wildmenu' completion @@ -167,36 +129,36 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = orange }, -- (preferred) any constant - String { fg = bright_green, gui = "italic" }, -- a string constant: "this is a string" + Constant { fg = c.orange }, -- (preferred) any constant + String { fg = c.bright_green, gui = italic }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' - Number { fg = orange }, -- a number constant: 234, 0xff - -- Boolean { }, -- a boolean constant: TRUE, false - -- Float { }, -- a floating point constant: 2.3e10 + Number { fg = c.orange }, -- a number constant: 234, 0xff + Boolean { fg = c.red }, -- a boolean constant: TRUE, false + Float { Number }, -- a floating point constant: 2.3e10 - Identifier { fg = green }, -- (preferred) any variable name - Function { fg = green }, -- function name (also: methods for classes) + Identifier { fg = c.green }, -- (preferred) any variable name + Function { fg = c.green }, -- function name (also: methods for classes) - Statement { fg = 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 = blue }, -- any other keyword - -- Exception { }, -- try, catch, throw + Statement { fg = c.purple }, -- (preferred) any statement + Conditional { fg = c.purple }, -- if, then, else, endif, switch, etc. + Repeat { fg = c.purple }, -- for, do, while, etc. + Label { fg = c.magenta }, -- case, default, etc. + Operator { fg = c.magenta }, -- "sizeof", "+", "*", etc. + Keyword { fg = c.blue }, -- any other keyword + Exception { fg = c.orange }, -- try, catch, throw - PreProc { fg = orange }, -- (preferred) generic Preprocessor + PreProc { fg = c.orange }, -- (preferred) generic Preprocessor -- Include { }, -- preprocessor #include -- Define { }, -- preprocessor #define -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = yellow }, -- (preferred) int, long, char, etc. + Type { fg = c.yellow }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = yellow }, -- (preferred) any special symbol + Special { fg = c.yellow }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this -- Delimiter { }, -- character that needs attention @@ -212,7 +174,7 @@ local theme = lush(function() -- Error { }, -- (preferred) any erroneous construct - Todo { fg = grey_3, gui = "italic" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo { fg = c.grey_3, gui = italic }, -- (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 diff --git a/lua/lush_theme/wombat_lush_classic.lua b/lua/lush_theme/wombat_lush_classic.lua new file mode 100644 index 0000000..9fbb196 --- /dev/null +++ b/lua/lush_theme/wombat_lush_classic.lua @@ -0,0 +1,278 @@ +-- +-- 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 +-- + +-- 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 + +local c = require("lush_theme.wombat_lush_colors").colors +local italic = require("lush_theme.wombat_lush_colors").italic + +-- 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. + + 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 { 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.light_yellow, bg = c.grey_5 }, -- Popup menu: normal item. + PmenuSel { fg = c.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.red }, -- warning messages + -- Whitespace { }, -- "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. + -- commented out groups should chain up to their "preferred" group by + -- default, + -- Uncomment and edit if you want more specific syntax highlighting. + + Constant { fg = c.orange }, -- (preferred) any constant + String { fg = c.bright_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 + + Identifier { fg = c.green }, -- (preferred) any variable name + Function { fg = c.green }, -- function name (also: methods for classes) + + 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 + + PreProc { fg = c.orange }, -- (preferred) generic Preprocessor + -- Include { }, -- preprocessor #include + -- Define { }, -- preprocessor #define + -- Macro { }, -- same as Define + -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. + + Type { fg = c.yellow }, -- (preferred) int, long, char, etc. + -- StorageClass { }, -- static, register, volatile, etc. + -- Structure { }, -- struct, union, enum, etc. + -- Typedef { }, -- A typedef + + Special { fg = c.yellow }, -- (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" }, + + -- ("Ignore", below, may be invisible...) + -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| + + -- Error { }, -- (preferred) any erroneous construct + + Todo { fg = c.grey_3, gui = italic }, -- (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 + -- documentation. + + -- LspReferenceText { }, -- used for highlighting "text" references + -- 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) + -- 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) + + -- 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 + + -- LspDiagnosticsUnderlineError { }, -- Used to underline "Error" diagnostics + -- LspDiagnosticsUnderlineWarning { }, -- Used to underline "Warning" diagnostics + -- LspDiagnosticsUnderlineInformation { }, -- Used to underline "Information" diagnostics + -- LspDiagnosticsUnderlineHint { }, -- Used to underline "Hint" diagnostics + + -- 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 + + -- 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 + + -- LspCodeLens { }, -- Used to color the virtual text of the codelens + + -- 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. + + -- 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`. + + -- 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 + +-- vi:nowrap diff --git a/lua/lush_theme/wombat_lush_colors.lua b/lua/lush_theme/wombat_lush_colors.lua new file mode 100644 index 0000000..096294a --- /dev/null +++ b/lua/lush_theme/wombat_lush_colors.lua @@ -0,0 +1,56 @@ +-- Define the base color palet for wombat +local lush = require('lush') +local hsl = lush.hsl + +local c_step = 20 + +local M = { + italic = "italic", + colors = {}, +} + +local c = M.colors + +c.black = hsl("#000000") +c.red = hsl("#ff786c") +c.darkred = c.red.darken(c_step) +c.green = hsl("#bde97c") -- 256mod #cae982 +c.bright_green = hsl("#95e454") +c.darkgreen = c.green.darken(c_step) +c.yellow = hsl("#efdeab") +c.light_yellow = hsl("#ffffd7") +c.darkyellow = c.yellow.darken(c_step) +c.blue = hsl("#6eb9f8") -- 256mod #88b8f6 +c.darkblue = c.blue.darken(c_step) +c.magenta = hsl("#ee87ff") +c.darkmagenta = c.magenta.darken(c_step) +c.cyan = hsl("#90fdf8") +c.darkcyan = c.cyan.darken(c_step) +c.white = hsl("#e4e0d7") + +c.orange = hsl("#e5786d") +c.darkorange = c.orange.darken(c_step) +c.purple = hsl("#d787ff") +c.violet = hsl("#b294bb") +c.grey = hsl("#574b49") +c.aqua = c.cyan +c.pink = c.red.lighten(c_step) + +-- A few grey scales +c.grey_1 = hsl("#c3c6ca") +c.grey_2 = hsl("#9c998e") +c.grey_3 = hsl("#636066") +c.grey_4 = hsl("#574b49") +c.grey_5 = hsl("#444444") +c.grey_6 = hsl("#32322f") + +-- Other colors +c.error_red = hsl("#ff2026") + +-- Set some fg/bg colors +c.dark_fg = hsl("#e4e0d7") +c.dark_bg = hsl("#1e1e1e") +c.dark_fg_256mod = hsl("#e3e0d7") +c.dark_bg_256mod = hsl("#242424") + +return M