chore: update nixvim options

mrtnvgr · Apr 14, 2024 · 14058ff · 14058ff
1 parent cda553b
commit 14058ff
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 69 deletions.
diff --git a/colorschemes/catppuccin.nix b/colorschemes/catppuccin.nix
@@ -3,7 +3,7 @@
   slug = "catppuccin";
   author = "https://github.com/catppuccin";
 
-  palette = rec {
+  palette = {
     background = "#24273a"; # base
     darkness = "#1e2030"; # mantle
     void = "#181926"; # crust

diff --git a/core/neovim/theme.nix b/core/neovim/theme.nix
@@ -14,42 +14,44 @@ in {
       enable = true;
       package = catppuccin-git;
 
-      transparent_background = !(isNull opacity || opacity == 1.0);
-
-      color_overrides.mocha = {
-        base = "#${palette.background}";
-        mantle = "#${palette.darkness}";
-        crust = "#${palette.void}";
-
-        surface0 = "#${palette.gray}";
-        surface1 = "#${palette.gray2}";
-        surface2 = "#${palette.gray3}";
-        overlay0 = "#${palette.gray4}";
-        overlay1 = "#${palette.gray5}";
-        overlay2 = "#${palette.gray6}";
-        subtext0 = "#${palette.gray7}";
-        subtext1 = "#${palette.gray8}";
-
-        text = "#${palette.text}";
-
-        red = "#${palette.red}";
-        green = "#${palette.green}";
-        yellow = "#${palette.yellow}";
-        blue = "#${palette.blue}";
-
-        peach = "#${palette.orange}";
-
-        mauve = "#${palette.violet}";
-        lavender = "#${palette.lavender}";
-
-        pink = "#${palette.pink}";
-        maroon = "#${palette.lipstick}";
-        flamingo = "#${palette.skin}";
-        rosewater = "#${palette.fawn}";
-
-        sapphire = "#${palette.sapphire}";
-        sky = "#${palette.sky}";
-        teal = "#${palette.teal}";
+      settings = {
+        transparent_background = !(isNull opacity || opacity == 1.0);
+
+        color_overrides.mocha = {
+          base = "#${palette.background}";
+          mantle = "#${palette.darkness}";
+          crust = "#${palette.void}";
+
+          surface0 = "#${palette.gray}";
+          surface1 = "#${palette.gray2}";
+          surface2 = "#${palette.gray3}";
+          overlay0 = "#${palette.gray4}";
+          overlay1 = "#${palette.gray5}";
+          overlay2 = "#${palette.gray6}";
+          subtext0 = "#${palette.gray7}";
+          subtext1 = "#${palette.gray8}";
+
+          text = "#${palette.text}";
+
+          red = "#${palette.red}";
+          green = "#${palette.green}";
+          yellow = "#${palette.yellow}";
+          blue = "#${palette.blue}";
+
+          peach = "#${palette.orange}";
+
+          mauve = "#${palette.violet}";
+          lavender = "#${palette.lavender}";
+
+          pink = "#${palette.pink}";
+          maroon = "#${palette.lipstick}";
+          flamingo = "#${palette.skin}";
+          rosewater = "#${palette.fawn}";
+
+          sapphire = "#${palette.sapphire}";
+          sky = "#${palette.sky}";
+          teal = "#${palette.teal}";
+        };
       };
     };
 

diff --git a/flake.lock b/flake.lock
diff --git a/modules/desktop/apps/neovim/plugins/lsp/completion.nix b/modules/desktop/apps/neovim/plugins/lsp/completion.nix
@@ -59,7 +59,7 @@ in {
 
       # Invert kinds
       # credits: https://github.com/catppuccin/nvim/issues/667#issuecomment-1965426553
-      programs.nixvim.colorschemes.catppuccin.custom_highlights = /* lua */ ''
+      programs.nixvim.colorschemes.catppuccin.settings.custom_highlights = /* lua */ ''
         function(C)
           local cmpfn = require("catppuccin.groups.integrations.cmp")
           setfenv(cmpfn.get, { C = C })