plugins: use mkPackageOption for iconsPackage options

This commit is contained in:
Matt Sturgeon 2024-09-03 14:33:13 +01:00
parent c4a54da4a5
commit 2132702a47
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
11 changed files with 44 additions and 44 deletions

View file

@ -195,10 +195,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
); );
extraOptions = { extraOptions = {
iconsPackage = lib.nixvim.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
keymaps = mapAttrs ( keymaps = mapAttrs (
optionName: funcName: optionName: funcName:

View file

@ -654,10 +654,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
}; };
extraOptions = { extraOptions = {
iconsPackage = lib.nixvim.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
}; };
extraConfig = cfg: { extraConfig = cfg: {

View file

@ -16,10 +16,10 @@ in
package = helpers.mkPluginPackageOption "chadtree" pkgs.vimPlugins.chadtree; package = helpers.mkPluginPackageOption "chadtree" pkgs.vimPlugins.chadtree;
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
options = { options = {
follow = helpers.defaultNullOpts.mkBool true '' follow = helpers.defaultNullOpts.mkBool true ''

View file

@ -57,10 +57,10 @@ in
package = helpers.mkPluginPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim; package = helpers.mkPluginPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim;
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
gitPackage = helpers.mkPackageOption { gitPackage = helpers.mkPackageOption {
name = "git"; name = "git";

View file

@ -41,10 +41,10 @@ in
package = helpers.mkPluginPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua; package = helpers.mkPluginPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
gitPackage = helpers.mkPackageOption { gitPackage = helpers.mkPackageOption {
name = "git"; name = "git";

View file

@ -88,10 +88,10 @@ in
package = helpers.mkPluginPackageOption "diffview" pkgs.vimPlugins.diffview-nvim; package = helpers.mkPluginPackageOption "diffview" pkgs.vimPlugins.diffview-nvim;
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
diffBinaries = mkBool false '' diffBinaries = mkBool false ''
Show diffs for binaries Show diffs for binaries

View file

@ -51,10 +51,10 @@ in
package = helpers.mkPluginPackageOption "lspsaga" pkgs.vimPlugins.lspsaga-nvim; package = helpers.mkPluginPackageOption "lspsaga" pkgs.vimPlugins.lspsaga-nvim;
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
ui = { ui = {
border = helpers.defaultNullOpts.mkBorder "single" "lspsaga" ""; border = helpers.defaultNullOpts.mkBorder "single" "lspsaga" "";

View file

@ -301,10 +301,10 @@ helpers.neovim-plugin.mkNeovimPlugin {
}; };
extraOptions = { extraOptions = {
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
}; };
extraConfig = cfg: { extraConfig = cfg: {

View file

@ -91,10 +91,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
''; '';
}; };
iconsPackage = mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
}; };
callSetup = false; callSetup = false;

View file

@ -63,10 +63,10 @@ in
visible = false; visible = false;
}; };
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
theme = mkOption { theme = mkOption {
type = with helpers.nixvimTypes; nullOr (maybeRaw str); type = with helpers.nixvimTypes; nullOr (maybeRaw str);

View file

@ -53,10 +53,10 @@ helpers.neovim-plugin.mkNeovimPlugin {
visible = false; visible = false;
}; };
iconsPackage = helpers.mkPackageOption { iconsPackage = lib.mkPackageOption pkgs [
name = "nvim-web-devicons"; "vimPlugins"
default = pkgs.vimPlugins.nvim-web-devicons; "nvim-web-devicons"
}; ] { nullable = true; };
profile = helpers.defaultNullOpts.mkEnumFirstDefault [ profile = helpers.defaultNullOpts.mkEnumFirstDefault [
"default" "default"