modules/neovim: move highlights to `ColorScheme` autocmd

3 files changed, 57 insertions, 21 deletions

diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 92f4e66..8a597c5 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -93,21 +93,10 @@ in
       # extraLuaPackages = ps: with ps; [
       # ];
       extraLuaConfig = ''
-        vim.cmd[[
-        colorscheme ${scheme.name}
-        hi PmenuSel guifg=${scheme.base05} guibg=${scheme.base03}
-        " hi StatusLine guibg=fg guifg=bg cterm=reverse gui=bold
-        hi StatusLine guibg=bg guifg=fg
-        hi FloatBorder guifg=${scheme.base01}
-        hi WinSeparator guifg=${scheme.base01}
-        hi WinBar guifg=${scheme.base03}
-        hi LineNr guifg=${scheme.base02}
-        hi LineNrAbove guifg=${scheme.base02}
-        hi LineNrBelow guifg=${scheme.base02}
-        ]]
 
         ${builtins.readFile ./nvim/init.lua}
         vim.cmd[[${scheme.extraVimConfig}]]
+        vim.cmd[[colorscheme ${scheme.name}]]
       '';
     };
   };
diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua
index 25a6737..bfbdcf8 100644
--- a/modules/neovim/nvim/lua/config/colorscheme.lua
+++ b/modules/neovim/nvim/lua/config/colorscheme.lua
@@ -1,6 +1,52 @@
 vim.cmd[[hi link FzfLuaBorder FloatBorder]]
-vim.cmd[[
-  hi TabLineFill guibg=bg
-  hi TabLineSel guibg=bg
-  hi TabLine guibg=bg
-]]
+vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args)
+  local colors = require('base16-colorscheme').colors
+  vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base01 })
+  vim.api.nvim_set_hl(0, 'WinSeparator', { fg = colors.base01 })
+  vim.api.nvim_set_hl(0, 'WinBar', { fg = colors.base03 })
+  vim.api.nvim_set_hl(0, 'LineNr', { fg = colors.base02 })
+  vim.api.nvim_set_hl(0, 'LineNrAbove', { fg = colors.base02 })
+  vim.api.nvim_set_hl(0, 'LineNrBelow', { fg = colors.base02 })
+  vim.cmd[[
+     hi TabLineFill guibg=bg
+     hi TabLineSel guibg=bg guifg=fg
+     hi TabLine guibg=bg
+  ]]
+
+  vim.api.nvim_set_hl(0, 'FzfLuaBorder', { link = FloatBorder })
+
+
+  -- i dislike syntax highlighting
+  -- vim.api.nvim_set_hl(0, 'Comment', {})
+  vim.api.nvim_set_hl(0, 'Constant', {})
+  -- vim.api.nvim_set_hl(0, 'String', {})
+  vim.api.nvim_set_hl(0, 'Character', { link = "String" })
+  vim.api.nvim_set_hl(0, 'Number', {})
+  vim.api.nvim_set_hl(0, 'Boolean', {})
+  vim.api.nvim_set_hl(0, 'Float', {})
+  vim.api.nvim_set_hl(0, 'Identifier', {})
+  vim.api.nvim_set_hl(0, 'Function', {})
+  vim.api.nvim_set_hl(0, 'Statement', {})
+  vim.api.nvim_set_hl(0, 'Conditional', {})
+  vim.api.nvim_set_hl(0, 'Repeat', {})
+  vim.api.nvim_set_hl(0, 'Label', {})
+  vim.api.nvim_set_hl(0, 'Operator', {})
+  vim.api.nvim_set_hl(0, 'Keyword', {})
+  vim.api.nvim_set_hl(0, 'Exception', {})
+  vim.api.nvim_set_hl(0, 'PreProc', {})
+  vim.api.nvim_set_hl(0, 'Include', {})
+  vim.api.nvim_set_hl(0, 'Define', {})
+  vim.api.nvim_set_hl(0, 'Macro', {})
+  vim.api.nvim_set_hl(0, 'PreCondit', {})
+  vim.api.nvim_set_hl(0, 'Type', {})
+  vim.api.nvim_set_hl(0, 'StorageClass', {})
+  vim.api.nvim_set_hl(0, 'Structure', {})
+  vim.api.nvim_set_hl(0, 'Typedef', {})
+  vim.api.nvim_set_hl(0, 'Special', {})
+  vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' })
+  vim.api.nvim_set_hl(0, 'Tag', {})
+  vim.api.nvim_set_hl(0, 'Delimiter', {})
+  -- vim.api.nvim_set_hl(0, 'SpecialComment', {})
+  vim.api.nvim_set_hl(0, 'Debug', {})
+  -- vim.api.nvim_set_hl(0, 'Underlined', {})
+end})
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 54bedb0..05bbc1f 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -1,9 +1,10 @@
 vim.g.mapleader = ' '
 
-vim.o.number = true
-vim.o.relativenumber = true
--- vim.o.number = false
--- vim.o.relativenumber = false
+-- vim.o.number = true
+-- vim.o.relativenumber = true
+vim.o.number = false
+vim.o.relativenumber = false
+
 vim.o.splitright = true
 vim.o.splitbelow = true
 vim.o.scrolloff = 15