neovim: fix SignColumn transparency (danth#628)

Closes: danth#599 Link: danth#628 Tested-by: https://github.com/anotherhadi Tested-by: NAHO <[email protected]> Reviewed-by: NAHO <[email protected]>
pinarruiz · Feb 19, 2025 · 9bdc211 · 9bdc211
1 parent a22ce8d
commit 9bdc211
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/modules/neovim/hm.nix b/modules/neovim/hm.nix
@@ -28,6 +28,15 @@
         programs.neovim =
           let
             cfg = config.stylix.targets.neovim;
+            transparencyCfg = builtins.toString (
+              lib.optional cfg.transparentBackground.main ''
+                vim.cmd.highlight({ "Normal", "guibg=NONE", "ctermbg=NONE" })
+                vim.cmd.highlight({ "NonText", "guibg=NONE", "ctermbg=NONE" })
+              ''
+              ++ lib.optional cfg.transparentBackground.signColumn ''
+                vim.cmd.highlight({ "SignColumn", "guibg=NONE", "ctermbg=NONE" })
+              ''
+            );
           in
           {
             plugins = [
@@ -41,6 +50,8 @@
                     base08 = '${base08}', base09 = '${base09}', base0A = '${base0A}', base0B = '${base0B}',
                     base0C = '${base0C}', base0D = '${base0D}', base0E = '${base0E}', base0F = '${base0F}'
                   })
+
+                  ${transparencyCfg}
                 '';
               })
               (lib.mkIf (cfg.plugin == "mini.base16") {
@@ -55,19 +66,11 @@
                       base0C = '${base0C}', base0D = '${base0D}', base0E = '${base0E}', base0F = '${base0F}'
                     }
                   })
+
+                  ${transparencyCfg}
                 '';
               })
             ];
-
-            extraLuaConfig = lib.mkMerge [
-              (lib.mkIf cfg.transparentBackground.main ''
-                vim.cmd.highlight({ "Normal", "guibg=NONE", "ctermbg=NONE" })
-                vim.cmd.highlight({ "NonText", "guibg=NONE", "ctermbg=NONE" })
-              '')
-              (lib.mkIf cfg.transparentBackground.signColumn ''
-                vim.cmd.highlight({ "SignColumn", "guibg=NONE", "ctermbg=NONE" })
-              '')
-            ];
           };
       };
 }
diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix
@@ -122,7 +122,7 @@ in
             })
             {
               programs.nixvim = {
-                highlight =
+                highlightOverride =
                   let
                     transparent = {
                       bg = "none";