vim: juggle around colorscheme implementation

6 files changed, 66 insertions, 48 deletions

diff --git a/.vim/colors/karafuru.lua b/.vim/colors/karafuru.lua
new file mode 100644
index 0000000..026475e
--- /dev/null
+++ b/.vim/colors/karafuru.lua
@@ -0,0 +1 @@
+require('theme').setup()
diff --git a/.vim/colors/lush.lua b/.vim/colors/lush.lua
deleted file mode 100644
index eab2415..0000000
--- a/.vim/colors/lush.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-if not vim.opt.termguicolors:get() then
-  return
-end
-
-vim.g.colors_name = 'lush'
-vim.opt.background = 'dark'
-require('lush')(require('colors'))
diff --git a/.vim/init.lua b/.vim/init.lua
index 3a58d14..c71c82c 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -147,8 +147,7 @@ wk_register {
 -- }}}
 
 -- COLORS -- {{{
--- g.nihoncolors_transparent_background = true
-   cmd [[ colorscheme lush ]]
+   require('theme').setup()
 -- }}}
 
 -- KEY BINDS -- {{{
diff --git a/.vim/lua/colors.lua b/.vim/lua/theme/init.lua
index 11abbea..5e85415 100644
--- a/.vim/lua/colors.lua
+++ b/.vim/lua/theme/init.lua
@@ -1,28 +1,10 @@
 ---@diagnostic disable: undefined-global
---- vim: fdm=marker
+
 local lush = require('lush')
 local hsl = lush.hsl
-local p = require('color_palette')
-
--- define terminal_color_* for :terminal
-vim.g.terminal_color_0  = p.normal.black
-vim.g.terminal_color_1  = p.normal.red
-vim.g.terminal_color_2  = p.normal.green
-vim.g.terminal_color_3  = p.normal.yellow
-vim.g.terminal_color_4  = p.normal.blue
-vim.g.terminal_color_5  = p.normal.magenta
-vim.g.terminal_color_6  = p.normal.cyan
-vim.g.terminal_color_7  = p.normal.white
-vim.g.terminal_color_8  = p.bright.black
-vim.g.terminal_color_9  = p.bright.red
-vim.g.terminal_color_10 = p.bright.green
-vim.g.terminal_color_11 = p.bright.yellow
-vim.g.terminal_color_12 = p.bright.blue
-vim.g.terminal_color_13 = p.bright.magenta
-vim.g.terminal_color_14 = p.bright.cyan
-vim.g.terminal_color_15 = p.bright.white
-
-return lush(function()
+local p = require('theme.palette')
+
+local colors = lush(function()
   return {
     -- Meta {{{
     deEmph { fg = hsl(p.dim.white).darken(5) },
@@ -79,6 +61,8 @@ return lush(function()
     WarningMsg   { fg = hsl(p.normal.yellow) }, -- warning messages
     Whitespace   { deEmph }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
     WildMenu     { bg = hsl(p.bright.black) }, -- current match in 'wildmenu' completion
+    WinBar       { ColorColumn, fg = hsl(p.normal.white) },
+    WinBarNC     { WinBar, fg = WinBar.fg.darken(10), gui = 'italic' },
     WinSeparator { deEmph },
     VertSplit    { WinSeparator },
     FloatBorder  { WinSeparator },
@@ -299,31 +283,38 @@ return lush(function()
 
     CmpItemAbbrMatch          { fg = hsl(p.normal.magenta) },
     CmpItemAbbrMatchFuzzy     { CmpItemAbbrMatch },
-    CmpItemKindText           { Comment },
-    CmpItemKindMethod         { TSMethod },
-    CmpItemKindFunction       { Function },
+    CmpItemKindArray          { Structure },
+    CmpItemKindBoolean        { Boolean },
+    CmpItemKindClass          { TSNamespace },
+    CmpItemKindColor          { Constant },
+    CmpItemKindConstant       { Constant },
     CmpItemKindConstructor    { Function },
+    CmpItemKindEnum           { Structure },
+    CmpItemKindEnumMember     { Type },
+    CmpItemKindEvent          { Conditional },
     CmpItemKindField          { TSField },
-    CmpItemKindVariable       { TSVariable },
-    CmpItemKindClass          { Structure },
+    CmpItemKindFile           { String },
+    CmpItemKindFolder         { String },
+    CmpItemKindFunction       { Function },
     CmpItemKindInterface      { Structure },
+    CmpItemKindKey            { TSField },
+    CmpItemKindKeyword        { Operator },
+    CmpItemKindMethod         { TSMethod },
     CmpItemKindModule         { Structure },
+    CmpItemKindNamespace      { TSNamespace },
+    CmpItemKindNull           { TSVariableBuiltin },
+    CmpItemKindObject         { Structure },
+    CmpItemKindOperator       { Operator },
+    CmpItemKindPackage        { TSNamespace },
     CmpItemKindProperty       { TSField },
-    CmpItemKindUnit           { Boolean },
-    CmpItemKindValue          { Character },
-    CmpItemKindEnum           { Structure },
-    CmpItemKindKeyword        { Operator },
-    CmpItemKindSnippet        { Special },
-    CmpItemKindColor          { Constant },
-    CmpItemKindFile           { String },
     CmpItemKindReference      { Character },
-    CmpItemKindFolder         { String },
-    CmpItemKindEnumMember     { Type },
-    CmpItemKindConstant       { Constant },
+    CmpItemKindSnippet        { Special },
     CmpItemKindStruct         { Structure },
-    CmpItemKindEvent          { Conditional },
-    CmpItemKindOperator       { Operator },
+    CmpItemKindText           { Comment },
     CmpItemKindTypeParameter  { Special },
+    CmpItemKindUnit           { Boolean },
+    CmpItemKindValue          { Character },
+    CmpItemKindVariable       { TSVariable },
 
     WhichKey { CursorLineNr },
     WhichKeyGroup { Keyword },
@@ -348,3 +339,37 @@ return lush(function()
     StatusLineNotify      { StatusLine, gui = 'none' },
   }
 end)
+
+local setup = function()
+  if vim.g.colors_name then
+    vim.cmd [[hi clear]]
+  end
+
+  vim.opt.background = 'dark'
+  vim.opt.termguicolors = true
+  vim.g.colors_name = 'karafuru'
+
+  -- define terminal_color_* for :terminal
+  vim.g.terminal_color_0  = p.normal.black
+  vim.g.terminal_color_1  = p.normal.red
+  vim.g.terminal_color_2  = p.normal.green
+  vim.g.terminal_color_3  = p.normal.yellow
+  vim.g.terminal_color_4  = p.normal.blue
+  vim.g.terminal_color_5  = p.normal.magenta
+  vim.g.terminal_color_6  = p.normal.cyan
+  vim.g.terminal_color_7  = p.normal.white
+  vim.g.terminal_color_8  = p.bright.black
+  vim.g.terminal_color_9  = p.bright.red
+  vim.g.terminal_color_10 = p.bright.green
+  vim.g.terminal_color_11 = p.bright.yellow
+  vim.g.terminal_color_12 = p.bright.blue
+  vim.g.terminal_color_13 = p.bright.magenta
+  vim.g.terminal_color_14 = p.bright.cyan
+  vim.g.terminal_color_15 = p.bright.white
+
+  lush(colors)
+
+  vim.cmd [[doautocmd ColorScheme]]
+end
+
+return {setup = setup}
diff --git a/.vim/lua/color_palette.lua b/.vim/lua/theme/palette.lua
index 14cc74e..14cc74e 100644
--- a/.vim/lua/color_palette.lua
+++ b/.vim/lua/theme/palette.lua
diff --git a/.vim/lua/color_palette.lua.in b/.vim/lua/theme/palette.lua.in
index e2b3072..e2b3072 100644
--- a/.vim/lua/color_palette.lua.in
+++ b/.vim/lua/theme/palette.lua.in