From 041f8917d225bad4036bf1b9a8cb60cf67554f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Mon, 10 Jun 2024 22:37:50 +0200
Subject: [PATCH] feat: improvements

---
 .../home-manager/desktops/hyprland/kitty.nix  |   1 +
 modules/home-manager/programs/neovide.nix     |  10 +-
 .../home-manager/programs/nixvim/default.nix  |   1 +
 .../programs/nixvim/presets/auto-format.nix   |   4 +
 .../programs/nixvim/presets/auto-save.nix     |   4 +
 .../nixvim/presets/base/diagnostics.nix       |   2 +-
 modules/home-manager/theme/md3-evo.nix        |   6 +-
 modules/home-manager/theme/nvim.vim           | 298 +++++++++---------
 8 files changed, 177 insertions(+), 149 deletions(-)

diff --git a/modules/home-manager/desktops/hyprland/kitty.nix b/modules/home-manager/desktops/hyprland/kitty.nix
index ac364e4..38b02b1 100644
--- a/modules/home-manager/desktops/hyprland/kitty.nix
+++ b/modules/home-manager/desktops/hyprland/kitty.nix
@@ -9,5 +9,6 @@
   '';
   settings = {
     window_padding_width = 10;
+    text_composition_strategy = "1.0 0";
   };
 }
diff --git a/modules/home-manager/programs/neovide.nix b/modules/home-manager/programs/neovide.nix
index 74974fe..957c1c0 100644
--- a/modules/home-manager/programs/neovide.nix
+++ b/modules/home-manager/programs/neovide.nix
@@ -33,6 +33,14 @@
   programs.nixvim = {
     extraConfigLua = # lua
       "if vim.g.neovide then vim.opt.linespace = -1 end";
-    globals.neovide_cursor_vfx_mode = "pixiedust";
+    globals = {
+      neovide_text_gamma = 0.0;
+      neovide_text_contrast = 0.0;
+      neovide_position_animation_length = 0.3;
+      neovide_remember_window_size = false;
+      neovide_hide_mouse_when_typing = true;
+      experimental_layer_grouping = true;
+      neovide_cursor_vfx_mode = "pixiedust";
+    };
   };
 }
diff --git a/modules/home-manager/programs/nixvim/default.nix b/modules/home-manager/programs/nixvim/default.nix
index 6c38fd1..dfe3c5e 100644
--- a/modules/home-manager/programs/nixvim/default.nix
+++ b/modules/home-manager/programs/nixvim/default.nix
@@ -37,6 +37,7 @@
     lazygit.enable = true;
     mergetool.enable = true;
     trouble.enable = true;
+    undotree.enable = true;
     base = {
       completion.enable = true;
       diagnostics.enable = true;
diff --git a/modules/home-manager/programs/nixvim/presets/auto-format.nix b/modules/home-manager/programs/nixvim/presets/auto-format.nix
index fa77d9b..8a72336 100644
--- a/modules/home-manager/programs/nixvim/presets/auto-format.nix
+++ b/modules/home-manager/programs/nixvim/presets/auto-format.nix
@@ -24,6 +24,10 @@ in
           else
             vim.g.${cfg.varName} = not vim.g.${cfg.varName}
           end
+          local lualine, lib = pcall(require, 'lualine')
+          if lualine then
+            lib.refresh()
+          end
         end
       '';
 
diff --git a/modules/home-manager/programs/nixvim/presets/auto-save.nix b/modules/home-manager/programs/nixvim/presets/auto-save.nix
index e801091..ed98562 100644
--- a/modules/home-manager/programs/nixvim/presets/auto-save.nix
+++ b/modules/home-manager/programs/nixvim/presets/auto-save.nix
@@ -55,6 +55,10 @@ in
             else
               vim.g.${cfg.varName} = not vim.g.${cfg.varName}
             end
+            local lualine, lib = pcall(require, 'lualine')
+            if lualine then
+              lib.refresh()
+            end
           end
         '';
     };
diff --git a/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix b/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
index 15d7593..10a3269 100644
--- a/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
@@ -13,7 +13,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    extraConfigLua = # lua
+    extraConfigLuaPre = # lua
       ''
         require("actions-preview").setup({})
 
diff --git a/modules/home-manager/theme/md3-evo.nix b/modules/home-manager/theme/md3-evo.nix
index a7acf58..1e64126 100644
--- a/modules/home-manager/theme/md3-evo.nix
+++ b/modules/home-manager/theme/md3-evo.nix
@@ -257,9 +257,13 @@ in
         {
           event = [ "Signal" ];
           pattern = [ "SIGUSR1" ];
-          command = "colorscheme md3-evo";
+          command = # vim
+            "colorscheme md3-evo";
+          nested = true;
         }
       ];
+      plugins.lualine.theme.__raw = # lua
+        "function() return vim.g.lualine_theme end";
     };
 
     gtk = {
diff --git a/modules/home-manager/theme/nvim.vim b/modules/home-manager/theme/nvim.vim
index e25f539..53a0672 100644
--- a/modules/home-manager/theme/nvim.vim
+++ b/modules/home-manager/theme/nvim.vim
@@ -1,4 +1,8 @@
-set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name="md3-evo"
 
 let g:neovide_transparency = {{custom.transparency}}
 let g:neovide_padding_top = {{custom.padding}}
@@ -9,15 +13,6 @@ let g:neovide_floating_blur_amount_x = {{custom.blur}}
 let g:neovide_floating_blur_amount_y = {{custom.blur}}
 let g:neovide_floating_shadow = 0
 
-if exists("g:neovide")
-  hi Normal guibg={{colors.surface.default.hex}} guifg={{colors.on_surface.default.hex}}
-  set pumblend=0
-  set winblend=0
-else
-  hi Normal ctermbg=NONE guibg=NONE guifg={{colors.on_surface.default.hex}}
-  set noshowmode
-end
-
 let g:terminal_color_0 = "{{colors.surface.default.hex}}"
 let g:terminal_color_1 = "{{colors.red.default.hex}}"
 let g:terminal_color_2 = "{{colors.green.default.hex}}"
@@ -37,173 +32,184 @@ let g:terminal_color_14 = "{{colors.cyan.default.hex}}"
 let g:terminal_color_15 = "{{colors.on_surface_variant.default.hex}}"
 set termguicolors
 
-hi Pmenu ctermbg=none guibg=none guifg={{colors.on_surface.default.hex}}
-hi PmenuSel guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi CursorColumn guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi CursorLine guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi WildMenu guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi MoreMsg guifg={{colors.primary.default.hex}}
-hi Question guifg={{colors.secondary.default.hex}}
+set background=dark
 
-hi Title guifg={{colors.primary.default.hex}}
-hi FloatTitle guifg={{colors.primary.default.hex}}
-hi Visual guifg={{colors.on_primary.default.hex}} guibg={{colors.primary.default.hex}}
+if exists("g:neovide")
+  hi! Normal guibg={{colors.surface.default.hex}} guifg={{colors.on_surface.default.hex}}
+  set pumblend=0
+  set winblend=0
+else
+  hi! Normal ctermbg=NONE guibg=NONE guifg={{colors.on_surface.default.hex}}
+end
 
-hi Folded guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
-hi FoldColumn guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
+hi! Pmenu ctermbg=none guibg=none guifg={{colors.on_surface.default.hex}}
+hi! PmenuSel guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! CursorColumn guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! CursorLine guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! WildMenu guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! MoreMsg guifg={{colors.primary.default.hex}}
+hi! Question guifg={{colors.secondary.default.hex}}
 
-hi Conceal guibg={{colors.secondary_container.default.hex}} guifg={{colors.on_secondary_container.default.hex}}
+hi! Title guifg={{colors.primary.default.hex}}
+hi! FloatTitle guifg={{colors.primary.default.hex}}
+hi! Visual guifg={{colors.on_primary.default.hex}} guibg={{colors.primary.default.hex}}
 
-hi TabLine guibg={{colors.primary_container.default.hex}} guifg={{colors.on_primary_container.default.hex}}
-hi TabLineFill guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! Folded guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
+hi! FoldColumn guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
 
-hi SpecialKey guifg={{colors.primary.default.hex}}
-hi Directory guifg={{colors.primary.default.hex}}
-hi Search guifg={{colors.on_tertiary.default.hex}} guibg={{colors.tertiary.default.hex}}
+hi! Conceal guibg={{colors.secondary_container.default.hex}} guifg={{colors.on_secondary_container.default.hex}}
 
-hi CmpItemKindCopilot guifg={{colors.cyan.default.hex}}
-hi CmpItemKindNpm guifg={{colors.red.default.hex}}
+hi! TabLine guibg={{colors.primary_container.default.hex}} guifg={{colors.on_primary_container.default.hex}}
+hi! TabLineFill guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
 
-hi Error guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
-hi ErrorMsg guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
-hi WarningMsg guibg={{colors.warning_container.default.hex}} guifg={{colors.on_warning_container.default.hex}}
-hi NvimInternalError guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
+hi! SpecialKey guifg={{colors.primary.default.hex}}
+hi! Directory guifg={{colors.primary.default.hex}}
+hi! Search guifg={{colors.on_tertiary.default.hex}} guibg={{colors.tertiary.default.hex}}
 
-hi DiagnosticError guifg={{colors.danger.default.hex}}
-hi DiagnosticWarn guifg={{colors.warning.default.hex}}
-hi DiagnosticInfo guifg={{colors.info.default.hex}}
-hi DiagnosticHint guifg={{colors.outline.default.hex}}
-hi DiagnosticOk guifg={{colors.success.default.hex}}
+hi! CmpItemKindCopilot guifg={{colors.cyan.default.hex}}
+hi! CmpItemKindNpm guifg={{colors.red.default.hex}}
 
-hi RedrawDebugNormal guibg={{colors.surface_variant.default.hex}} guifg={{colors.on_surface_variant.default.hex}}
-hi RedrawDebugClear guibg={{colors.warning.default.hex}} guifg={{colors.on_warning.default.hex}}
-hi RedrawDebugComposed guibg={{colors.success.default.hex}} guifg={{colors.on_success.default.hex}}
-hi RedrawDebugRecompose guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
+hi! Error guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
+hi! ErrorMsg guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
+hi! WarningMsg guibg={{colors.warning_container.default.hex}} guifg={{colors.on_warning_container.default.hex}}
+hi! NvimInternalError guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
 
-hi DiagnosticUnderlineError gui=undercurl guisp={{colors.danger.default.hex}}
-hi DiagnosticUnderlineWarn gui=undercurl guisp={{colors.warning.default.hex}}
-hi DiagnosticUnderlineInfo gui=undercurl guisp={{colors.info.default.hex}}
-hi DiagnosticUnderlineHint gui=undercurl guisp={{colors.outline.default.hex}}
-hi DiagnosticUnderlineOk gui=undercurl guisp={{colors.success.default.hex}}
-hi DiagnosticDeprecated gui=strikethrough guisp={{colors.danger.default.hex}}
+hi! DiagnosticError guifg={{colors.danger.default.hex}}
+hi! DiagnosticWarn guifg={{colors.warning.default.hex}}
+hi! DiagnosticInfo guifg={{colors.info.default.hex}}
+hi! DiagnosticHint guifg={{colors.outline.default.hex}}
+hi! DiagnosticOk guifg={{colors.success.default.hex}}
 
-hi SpellBad gui=undercurl guisp={{colors.success.default.hex}}
-hi SpellCap gui=undercurl guisp={{colors.success.default.hex}}
-hi SpellRare gui=undercurl guisp={{colors.success.default.hex}}
-hi SpellLocal gui=undercurl guisp={{colors.success.default.hex}}
+hi! RedrawDebugNormal guibg={{colors.surface_variant.default.hex}} guifg={{colors.on_surface_variant.default.hex}}
+hi! RedrawDebugClear guibg={{colors.warning.default.hex}} guifg={{colors.on_warning.default.hex}}
+hi! RedrawDebugComposed guibg={{colors.success.default.hex}} guifg={{colors.on_success.default.hex}}
+hi! RedrawDebugRecompose guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
 
-hi DiffAdd guibg={{colors.green_container.default.hex}} guifg={{colors.on_green_container.default.hex}}
-hi DiffChange guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
-hi DiffDelete guibg={{colors.red_container.default.hex}} guifg={{colors.on_red_container.default.hex}}
-hi DiffText guibg={{colors.blue_container.default.hex}} guifg={{colors.on_blue_container.default.hex}}
+hi! DiagnosticUnderlineError gui=undercurl guisp={{colors.danger.default.hex}}
+hi! DiagnosticUnderlineWarn gui=undercurl guisp={{colors.warning.default.hex}}
+hi! DiagnosticUnderlineInfo gui=undercurl guisp={{colors.info.default.hex}}
+hi! DiagnosticUnderlineHint gui=undercurl guisp={{colors.outline.default.hex}}
+hi! DiagnosticUnderlineOk gui=undercurl guisp={{colors.success.default.hex}}
+hi! DiagnosticDeprecated gui=strikethrough guisp={{colors.danger.default.hex}}
 
-hi NeoTreeGitAdded guifg={{colors.green.default.hex}}
-hi NeoTreeGitDeleted guifg={{colors.red.default.hex}}
-hi NeoTreeGitModified guifg={{colors.yellow.default.hex}}
-hi NeoTreeGitConflict guifg={{colors.danger.default.hex}}
-hi NeoTreeGitUntracked guifg={{colors.blue.default.hex}}
+hi! SpellBad gui=undercurl guisp={{colors.success.default.hex}}
+hi! SpellCap gui=undercurl guisp={{colors.success.default.hex}}
+hi! SpellRare gui=undercurl guisp={{colors.success.default.hex}}
+hi! SpellLocal gui=undercurl guisp={{colors.success.default.hex}}
 
-hi NonText guifg={{colors.outline_variant.default.hex}}
-hi LineNr guifg={{colors.outline_variant.default.hex}}
-hi CursorLineNr guifg={{colors.on_surface.default.hex}}
-hi SignColumn guibg=none guifg={{colors.on_surface.default.hex}}
+hi! DiffAdd guibg={{colors.green_container.default.hex}} guifg={{colors.on_green_container.default.hex}}
+hi! DiffChange guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
+hi! DiffDelete guibg={{colors.red_container.default.hex}} guifg={{colors.on_red_container.default.hex}}
+hi! DiffText guibg={{colors.blue_container.default.hex}} guifg={{colors.on_blue_container.default.hex}}
 
-hi IblScope guifg={{colors.on_surface.default.hex}}
-hi @ibl.scope.char.1 guifg={{colors.on_surface.default.hex}}
-hi @ibl.scope.underline.1 guisp={{colors.on_surface.default.hex}}
+hi! NeoTreeGitAdded guifg={{colors.green.default.hex}}
+hi! NeoTreeGitDeleted guifg={{colors.red.default.hex}}
+hi! NeoTreeGitModified guifg={{colors.yellow.default.hex}}
+hi! NeoTreeGitConflict guifg={{colors.danger.default.hex}}
+hi! NeoTreeGitUntracked guifg={{colors.blue.default.hex}}
 
-hi Comment guifg={{colors.outline.default.hex}}
-hi Todo guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
-hi def link @comment.todo Todo
-hi def link @comment.error Error
+hi! NonText guifg={{colors.outline_variant.default.hex}}
+hi! LineNr guifg={{colors.outline_variant.default.hex}}
+hi! CursorLineNr guifg={{colors.on_surface.default.hex}}
+hi! SignColumn guibg=none guifg={{colors.on_surface.default.hex}}
 
-hi String guifg={{colors.strings.default.hex}}
+hi! IblScope guifg={{colors.on_surface.default.hex}}
+hi! @ibl.scope.char.1 guifg={{colors.on_surface.default.hex}}
+hi! @ibl.scope.underline.1 guisp={{colors.on_surface.default.hex}}
 
-hi Identifier guifg={{colors.on_surface.default.hex}}
-hi Statement gui=bold guifg={{colors.on_surface.default.hex}}
-hi def link Operator Normal
-hi @conditional.ternary guifg={{colors.on_surface.default.hex}}
-hi def link @keyword.conditional.ternary Operator
-hi def link Delimiter Normal
-hi def link @lsp.mod.local Normal
-hi def link @parameter Identifier
+hi! Comment guifg={{colors.outline.default.hex}}
+hi! Todo guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
+hi! link @comment.todo Todo
+hi! link @comment.error Error
 
-hi @lsp.mod.defaultLibrary gui=bold
-hi @lsp.mod.readonly gui=italic
+hi! String guifg={{colors.strings.default.hex}}
 
-hi Constant guifg={{colors.constants.default.hex}}
-hi def link @variable Constant
+hi! Identifier guifg={{colors.on_surface.default.hex}}
+hi! @variable guifg={{colors.on_surface.default.hex}}
+hi! Operator guifg={{colors.on_surface.default.hex}}
+hi! Delimiter guifg={{colors.on_surface.default.hex}}
+hi! Statement gui=bold guifg={{colors.on_surface.default.hex}}
+hi! link Operator Normal
+hi! @conditional.ternary guifg={{colors.on_surface.default.hex}}
+hi! link @keyword.conditional.ternary Operator
+hi! link Delimiter Normal
+hi! link @lsp.mod.local Normal
+hi! link @parameter Identifier
 
-hi @property guifg={{colors.properties.default.hex}}
-hi def link @field @property
-hi def link @label.json @property
-hi def link @label.jsonc @label.json
-hi def link @property.typescript @property
-hi def link @lsp.type.property @property
-hi def link @attribute @property
-hi def link @tag.attribute @property
+hi! @lsp.mod.defaultLibrary gui=bold
+hi! @lsp.mod.readonly gui=italic
 
-hi def link @lsp.type.variable Constant
-hi def link @lsp.typemod.variable.local Identifier
+hi! Constant guifg={{colors.constants.default.hex}}
 
-hi Keyword guifg={{colors.keywords.default.hex}}
-hi Special guifg={{colors.keywords.default.hex}}
-hi def link Character Keyword
-hi def link Boolean Keyword
-hi def link Repeat Keyword
-hi def link Label Keyword
-hi def link Exception Keyword
-hi def link Include Keyword
-hi def link Conditional Keyword
-hi def link @type.builtin Keyword
+hi! @property guifg={{colors.properties.default.hex}}
+hi! link @field @property
+hi! link @variable.member @property
+hi! link @label.json @property
+hi! link @label.jsonc @label.json
+hi! link @property.typescript @property
+hi! link @lsp.type.property @property
+hi! link @attribute @property
+hi! link @tag.attribute @property
 
-hi Number guifg={{colors.numbers.default.hex}}
-hi Function guifg={{colors.functions.default.hex}}
+hi! link @lsp.type.variable Constant
+hi! link @lsp.typemod.variable.local Identifier
 
-hi Structure guifg={{colors.structures.default.hex}}
-hi def link PreProc Structure
-hi def link Tag Structure
-hi def link @attribute.typescript Structure
+hi! Keyword guifg={{colors.keywords.default.hex}}
+hi! Special guifg={{colors.keywords.default.hex}}
+hi! link Character Keyword
+hi! link Boolean Keyword
+hi! link Repeat Keyword
+hi! link Label Keyword
+hi! link Exception Keyword
+hi! link Include Keyword
+hi! link Conditional Keyword
+hi! link @type.builtin Keyword
 
-hi Type gui=none guifg={{colors.types.default.hex}}
-hi def link @lsp.type.interface Type
+hi! Number guifg={{colors.numbers.default.hex}}
+hi! Function guifg={{colors.functions.default.hex}}
 
-hi IlluminatedWordText gui=none guibg={{colors.surface_container_highest.default.hex}}
-hi IlluminatedWordRead gui=none guibg={{colors.surface_container_highest.default.hex}}
-hi IlluminatedWordWrite gui=none guibg={{colors.surface_container_highest.default.hex}}
-hi MatchParen gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! Structure guifg={{colors.structures.default.hex}}
+hi! link PreProc Structure
+hi! link Tag Structure
+hi! link @attribute.typescript Structure
 
-:lua require('lualine').setup({options = {theme = {
-  \  insert = {
-  \    a = {fg = "{{colors.on_green.default.hex}}", bg = "{{colors.green.default.hex}}", gui = "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+hi! Type gui=none guifg={{colors.types.default.hex}}
+hi! link @lsp.type.interface Type
+
+hi! IlluminatedWordText gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! IlluminatedWordRead gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! IlluminatedWordWrite gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! MatchParen gui=none guibg={{colors.surface_container_highest.default.hex}}
+
+let g:lualine_theme = {
+  \  "insert": {
+  \    "a": {"fg": "{{colors.on_green.default.hex}}", "bg": "{{colors.green.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  normal = {
-  \    a = {fg = "{{colors.on_primary.default.hex}}", bg = "{{colors.primary.default.hex}}", gui = "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  "normal": {
+  \    "a": {"fg": "{{colors.on_primary.default.hex}}", "bg": "{{colors.primary.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  command = {
-  \    a = {fg = "{{colors.on_tertiary.default.hex}}", bg = "{{colors.tertiary.default.hex}}", gui = "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  "command": {
+  \    "a": {"fg": "{{colors.on_tertiary.default.hex}}", "bg": "{{colors.tertiary.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  visual = {
-  \    a = {fg = "{{colors.on_magenta.default.hex}}", bg = "{{colors.magenta.default.hex}}", gui = "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  "visual": {
+  \    "a": {"fg": "{{colors.on_magenta.default.hex}}", "bg": "{{colors.magenta.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  replace = {
-  \    a = {fg = "{{colors.on_red.default.hex}}", bg = "{{colors.red.default.hex}}", gui = "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  "replace": {
+  \    "a": {"fg": "{{colors.on_red.default.hex}}", "bg": "{{colors.red.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  inactive = {
-  \    a = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}", gui = "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \  "inactive": {
+  \    "a": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
   \  },
-  \} } })
-
-lua require('nvim-web-devicons').refresh()
+  \}