diff --git a/modules/neovim/hm.nix b/modules/neovim/hm.nix index 024bed14a..7698b897d 100644 --- 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 index b87fb7c9e..4918c4135 100644 --- a/modules/nixvim/nixvim.nix +++ b/modules/nixvim/nixvim.nix @@ -122,7 +122,7 @@ in }) { programs.nixvim = { - highlight = + highlightOverride = let transparent = { bg = "none";