plugins: remove all use of lib.nixvim.mkPackageOption

This commit is contained in:
Matt Sturgeon 2024-09-03 15:40:46 +01:00
parent 84676128f8
commit ae3a2c9d10
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
28 changed files with 73 additions and 95 deletions

View file

@ -1,5 +1,6 @@
{
helpers,
lib,
pkgs,
...
}:
@ -47,9 +48,8 @@ helpers.vim-plugin.mkVimPlugin {
};
extraOptions = {
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
};

View file

@ -13,9 +13,8 @@ helpers.vim-plugin.mkVimPlugin {
# In typical tpope fashion, this plugin has no config options
extraOptions = {
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
};

View file

@ -13,9 +13,8 @@ helpers.neovim-plugin.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ];
extraOptions = {
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
};

View file

@ -16,9 +16,8 @@ in
package = helpers.mkPluginPackageOption "git-worktree" pkgs.vimPlugins.git-worktree-nvim;
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
enableTelescope = mkEnableOption "telescope integration";

View file

@ -4,7 +4,7 @@
...
}:
let
inherit (lib.nixvim) defaultNullOpts mkPackageOption;
inherit (lib.nixvim) defaultNullOpts;
types = lib.nixvim.nixvimTypes;
in
lib.nixvim.neovim-plugin.mkNeovimPlugin {
@ -128,9 +128,8 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
};
extraOptions = {
gitPackage = mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
};

View file

@ -16,9 +16,8 @@ in
package = helpers.mkPluginPackageOption "gitgutter" pkgs.vimPlugins.gitgutter;
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
recommendedSettings = mkOption {

View file

@ -242,9 +242,8 @@ helpers.neovim-plugin.mkNeovimPlugin {
];
extraOptions = {
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
};

View file

@ -70,14 +70,12 @@ helpers.vim-plugin.mkVimPlugin {
};
extraOptions = {
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
lazygitPackage = helpers.mkPackageOption {
name = "lazygit";
default = pkgs.lazygit;
lazygitPackage = lib.mkPackageOption pkgs "lazygit" {
nullable = true;
};
};

View file

@ -101,9 +101,8 @@ helpers.neovim-plugin.mkNeovimPlugin {
};
extraOptions = {
gitPackage = helpers.mkPackageOption {
name = "git";
default = pkgs.git;
gitPackage = lib.mkPackageOption pkgs "git" {
nullable = true;
};
};