From 14df1e648889db48b43edba9813abc59587bdd48 Mon Sep 17 00:00:00 2001 From: soulsoiledit Date: Fri, 30 Aug 2024 18:55:57 +0200 Subject: [PATCH 1/2] neovim: add stylix.targets.neovim.plugin option Add the stylix.targets.neovim.plugin option to select between the previous base16-nvim and the new default mini.base16 [1] plugin, offering better plugin integration. [1]: https://github.com/echasnovski/mini.base16 Link: https://github.com/danth/stylix/pull/536 Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/neovim/hm.nix | 56 +++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/modules/neovim/hm.nix b/modules/neovim/hm.nix index 587c196e8..da72dc112 100644 --- a/modules/neovim/hm.nix +++ b/modules/neovim/hm.nix @@ -2,9 +2,12 @@ { options.stylix.targets.neovim = { - enable = - config.lib.stylix.mkEnableTarget "Neovim" true; - + enable = config.lib.stylix.mkEnableTarget "Neovim" true; + plugin = lib.mkOption { + type = lib.types.enum [ "base16-nvim" "mini.base16" ]; + default = "mini.base16"; + description = "Plugin used for the colorscheme"; + }; transparentBackground = { main = lib.mkEnableOption "background transparency for the main Neovim window"; signColumn = lib.mkEnableOption "background transparency for the Neovim sign column"; @@ -17,27 +20,44 @@ cfg = config.stylix.targets.neovim; in { - plugins = lib.singleton { - plugin = pkgs.vimPlugins.base16-nvim; - type = "lua"; - config = lib.mkMerge [ - (with config.lib.stylix.colors.withHashtag; '' + plugins = [ + (lib.mkIf (cfg.plugin == "base16-nvim") { + plugin = pkgs.vimPlugins.base16-nvim; + type = "lua"; + config = with config.lib.stylix.colors.withHashtag; '' require('base16-colorscheme').setup({ base00 = '${base00}', base01 = '${base01}', base02 = '${base02}', base03 = '${base03}', base04 = '${base04}', base05 = '${base05}', base06 = '${base06}', base07 = '${base07}', base08 = '${base08}', base09 = '${base09}', base0A = '${base0A}', base0B = '${base0B}', base0C = '${base0C}', base0D = '${base0D}', base0E = '${base0E}', base0F = '${base0F}' }) - '') - (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" }) - '') - ]; - }; + ''; + }) + (lib.mkIf (cfg.plugin == "mini.base16") { + plugin = pkgs.vimPlugins.mini-nvim; + type = "lua"; + config = with config.lib.stylix.colors.withHashtag; '' + require('mini.base16').setup({ + palette = { + base00 = '${base00}', base01 = '${base01}', base02 = '${base02}', base03 = '${base03}', + base04 = '${base04}', base05 = '${base05}', base06 = '${base06}', base07 = '${base07}', + base08 = '${base08}', base09 = '${base09}', base0A = '${base0A}', base0B = '${base0B}', + base0C = '${base0C}', base0D = '${base0D}', base0E = '${base0E}', base0F = '${base0F}' + } + }) + ''; + }) + ]; + + 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" }) + '') + ]; }; }; } From 17f6d6e5aaf3c9eb393a07aeb34d374d7130081e Mon Sep 17 00:00:00 2001 From: soulsoiledit Date: Fri, 30 Aug 2024 18:55:22 +0200 Subject: [PATCH 2/2] nixvim: add stylix.targets.nixvim.plugin option Add the stylix.targets.nixvim.plugin option to select between the previous base16-nvim and the new default mini.base16 [1] plugin, offering better plugin integration. [1]: https://github.com/echasnovski/mini.base16 Link: https://github.com/danth/stylix/pull/536 Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Tested-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/nixvim/nixvim.nix | 59 ++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix index 2c7c8a0ff..b7bc335d0 100644 --- a/modules/nixvim/nixvim.nix +++ b/modules/nixvim/nixvim.nix @@ -3,10 +3,16 @@ lib, options, ... -}: { +}: let + cfg = config.stylix.targets.nixvim; +in { options.stylix.targets.nixvim = { - enable = - config.lib.stylix.mkEnableTarget "nixvim" true; + enable = config.lib.stylix.mkEnableTarget "nixvim" true; + plugin = lib.mkOption { + type = lib.types.enum [ "base16-nvim" "mini.base16" ]; + default = "mini.base16"; + description = "Plugin used for the colorscheme"; + }; transparentBackground = { main = lib.mkEnableOption "background transparency for the main NeoVim window"; signColumn = lib.mkEnableOption "background transparency for the NeoVim sign column"; @@ -38,31 +44,44 @@ ) ]; - config = lib.mkIf (config.stylix.enable && config.stylix.targets.nixvim.enable && (config.programs ? nixvim)) ( - lib.optionalAttrs (builtins.hasAttr "nixvim" options.programs) { - programs.nixvim = { - colorschemes.base16 = { + config = lib.mkIf (config.stylix.enable && cfg.enable && (config.programs ? nixvim)) ( + lib.optionalAttrs (builtins.hasAttr "nixvim" options.programs) (lib.mkMerge [ + (lib.mkIf (cfg.plugin == "base16-nvim") { + programs.nixvim.colorschemes.base16 = { + enable = true; + colorscheme = { inherit (config.lib.stylix.colors.withHashtag) base00 base01 base02 base03 base04 base05 base06 base07 base08 base09 base0A base0B base0C base0D base0E base0F; }; - - enable = true; }; + }) + (lib.mkIf (cfg.plugin == "mini.base16") { + programs.nixvim.plugins.mini = { + enable = true; - highlight = let - cfg = config.stylix.targets.nixvim; - transparent = { - bg = "none"; - ctermbg = "none"; + modules.base16.palette = { + inherit (config.lib.stylix.colors.withHashtag) + base00 base01 base02 base03 base04 base05 base06 base07 + base08 base09 base0A base0B base0C base0D base0E base0F; }; - in { - Normal = lib.mkIf cfg.transparentBackground.main transparent; - NonText = lib.mkIf cfg.transparentBackground.main transparent; - SignColumn = lib.mkIf cfg.transparentBackground.signColumn transparent; }; - }; - } + }) + { + programs.nixvim = { + highlight = let + transparent = { + bg = "none"; + ctermbg = "none"; + }; + in { + Normal = lib.mkIf cfg.transparentBackground.main transparent; + NonText = lib.mkIf cfg.transparentBackground.main transparent; + SignColumn = lib.mkIf cfg.transparentBackground.signColumn transparent; + }; + }; + } + ]) ); }