plugins: remove all uses of lib.nixvim.mkPluginPackageOption

plugins/colorschemes/dracula.nix

@@ -13,7 +13,12 @@ in
     colorschemes.dracula = {
       enable = lib.mkEnableOption "dracula";
 
-      package = lib.nixvim.mkPluginPackageOption "dracula" pkgs.vimPlugins.dracula-vim;
+      package = lib.mkPackageOption pkgs "dracula" {
+        default = [
+          "vimPlugins"
+          "dracula-vim"
+        ];
+      };
 
       bold = lib.mkOption {
         type = types.bool;

plugins/completion/copilot-lua.nix

@@ -19,7 +19,12 @@ in
       // {
         enable = mkEnableOption "copilot.lua";
 
-        package = helpers.mkPluginPackageOption "copilot.lua" pkgs.vimPlugins.copilot-lua;
+        package = lib.mkPackageOption pkgs "copilot.lua" {
+          default = [
+            "vimPlugins"
+            "copilot-lua"
+          ];
+        };
 
         panel = {
           enabled = helpers.defaultNullOpts.mkBool true "Enable the panel.";

plugins/completion/coq-thirdparty.nix

@@ -13,7 +13,12 @@ in
   options.plugins.coq-thirdparty = {
     enable = mkEnableOption "coq-thirdparty";
 
-    package = helpers.mkPluginPackageOption "coq-thirdparty" pkgs.vimPlugins.coq-thirdparty;
+    package = lib.mkPackageOption pkgs "coq-thirdparty" {
+      default = [
+        "vimPlugins"
+        "coq-thirdparty"
+      ];
+    };
 
     sources = mkOption {
       type = types.listOf (

plugins/completion/lspkind.nix

@@ -13,7 +13,12 @@ in
   options.plugins.lspkind = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lspkind.nvim";
 
-    package = helpers.mkPluginPackageOption "lspkind" pkgs.vimPlugins.lspkind-nvim;
+    package = lib.mkPackageOption pkgs "lspkind" {
+      default = [
+        "vimPlugins"
+        "lspkind-nvim"
+      ];
+    };
 
     mode = helpers.defaultNullOpts.mkEnum [
       "text"

plugins/filetrees/chadtree.nix

@@ -14,7 +14,12 @@ in
   options.plugins.chadtree = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "chadtree";
 
-    package = helpers.mkPluginPackageOption "chadtree" pkgs.vimPlugins.chadtree;
+    package = lib.mkPackageOption pkgs "chadtree" {
+      default = [
+        "vimPlugins"
+        "chadtree"
+      ];
+    };
 
     iconsPackage = lib.mkPackageOption pkgs [
       "vimPlugins"

plugins/filetrees/neo-tree.nix

@@ -55,7 +55,12 @@ in
     // {
       enable = mkEnableOption "neo-tree";
 
-      package = helpers.mkPluginPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim;
+      package = lib.mkPackageOption pkgs "neo-tree" {
+        default = [
+          "vimPlugins"
+          "neo-tree-nvim"
+        ];
+      };
 
       iconsPackage = lib.mkPackageOption pkgs [
         "vimPlugins"

plugins/filetrees/nvim-tree.nix

@@ -39,7 +39,12 @@ in
   options.plugins.nvim-tree = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-tree";
 
-    package = helpers.mkPluginPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
+    package = lib.mkPackageOption pkgs "nvim-tree" {
+      default = [
+        "vimPlugins"
+        "nvim-tree-lua"
+      ];
+    };
 
     iconsPackage = lib.mkPackageOption pkgs [
       "vimPlugins"

plugins/git/diffview.nix

@@ -86,7 +86,12 @@ in
     // {
       enable = mkEnableOption "diffview";
 
-      package = helpers.mkPluginPackageOption "diffview" pkgs.vimPlugins.diffview-nvim;
+      package = lib.mkPackageOption pkgs "diffview" {
+        default = [
+          "vimPlugins"
+          "diffview-nvim"
+        ];
+      };
 
       iconsPackage = lib.mkPackageOption pkgs [
         "vimPlugins"

plugins/git/git-worktree.nix

@@ -14,7 +14,12 @@ in
     plugins.git-worktree = {
       enable = mkEnableOption "git-worktree";
 
-      package = helpers.mkPluginPackageOption "git-worktree" pkgs.vimPlugins.git-worktree-nvim;
+      package = lib.mkPackageOption pkgs "git-worktree" {
+        default = [
+          "vimPlugins"
+          "git-worktree-nvim"
+        ];
+      };
 
       gitPackage = lib.mkPackageOption pkgs "git" {
         nullable = true;

plugins/git/gitgutter.nix

@@ -14,7 +14,12 @@ in
     plugins.gitgutter = {
       enable = mkEnableOption "gitgutter";
 
-      package = helpers.mkPluginPackageOption "gitgutter" pkgs.vimPlugins.gitgutter;
+      package = lib.mkPackageOption pkgs "gitgutter" {
+        default = [
+          "vimPlugins"
+          "gitgutter"
+        ];
+      };
 
       gitPackage = lib.mkPackageOption pkgs "git" {
         nullable = true;

plugins/git/gitlinker.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.gitlinker = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "gitlinker.nvim";
 
-    package = helpers.mkPluginPackageOption "gitlinker.nvim" pkgs.vimPlugins.gitlinker-nvim;
+    package = lib.mkPackageOption pkgs "gitlinker.nvim" {
+      default = [
+        "vimPlugins"
+        "gitlinker-nvim"
+      ];
+    };
 
     remote = helpers.mkNullOrOption types.str "Force the use of a specific remote.";
 

plugins/git/gitmessenger.nix

@@ -12,7 +12,12 @@ with lib;
   options.plugins.gitmessenger = {
     enable = mkEnableOption "gitmessenger";
 
-    package = helpers.mkPluginPackageOption "git-messenger" pkgs.vimPlugins.git-messenger-vim;
+    package = lib.mkPackageOption pkgs "git-messenger" {
+      default = [
+        "vimPlugins"
+        "git-messenger-vim"
+      ];
+    };
 
     closeOnCursorMoved = helpers.defaultNullOpts.mkBool true ''
       A popup window is no longer closed automatically when moving a cursor after the window is

plugins/languages/clangd-extensions.nix

@@ -98,7 +98,12 @@ in
   options.plugins.clangd-extensions = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "clangd_extensions, plugins implementing clangd LSP extensions";
 
-    package = helpers.mkPluginPackageOption "clangd_extensions.nvim" pkgs.vimPlugins.clangd_extensions-nvim;
+    package = lib.mkPackageOption pkgs "clangd_extensions.nvim" {
+      default = [
+        "vimPlugins"
+        "clangd_extensions-nvim"
+      ];
+    };
 
     enableOffsetEncodingWorkaround = mkEnableOption ''
       utf-16 offset encoding. This is used to work around the warning:

plugins/languages/helm.nix

@@ -15,7 +15,12 @@ in
   options.plugins.helm = {
     enable = mkEnableOption "vim-helm";
 
-    package = helpers.mkPluginPackageOption "vim-helm" pkgs.vimPlugins.vim-helm;
+    package = lib.mkPackageOption pkgs "vim-helm" {
+      default = [
+        "vimPlugins"
+        "vim-helm"
+      ];
+    };
   };
 
   config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

plugins/languages/lean.nix

@@ -13,7 +13,12 @@ in
   options.plugins.lean = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lean-nvim";
 
-    package = helpers.mkPluginPackageOption "lean-nvim" pkgs.vimPlugins.lean-nvim;
+    package = lib.mkPackageOption pkgs "lean-nvim" {
+      default = [
+        "vimPlugins"
+        "lean-nvim"
+      ];
+    };
 
     leanPackage = lib.mkPackageOption pkgs "lean" {
       nullable = true;

plugins/languages/lint.nix

@@ -137,7 +137,12 @@ in
   options.plugins.lint = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-lint";
 
-    package = helpers.mkPluginPackageOption "nvim-lint" pkgs.vimPlugins.nvim-lint;
+    package = lib.mkPackageOption pkgs "nvim-lint" {
+      default = [
+        "vimPlugins"
+        "nvim-lint"
+      ];
+    };
 
     lintersByFt = mkOption {
       type = with types; attrsOf (listOf str);

plugins/languages/nvim-jdtls.nix

@@ -13,7 +13,12 @@ in
   options.plugins.nvim-jdtls = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-jdtls";
 
-    package = helpers.mkPluginPackageOption "nvim-jdtls" pkgs.vimPlugins.nvim-jdtls;
+    package = lib.mkPackageOption pkgs "nvim-jdtls" {
+      default = [
+        "vimPlugins"
+        "nvim-jdtls"
+      ];
+    };
 
     cmd = helpers.mkNullOrOption (types.listOf types.str) ''
       The command that starts the language server.

plugins/languages/openscad.nix

@@ -13,7 +13,12 @@ in
   options.plugins.openscad = {
     enable = mkEnableOption "openscad.nvim, a plugin to manage OpenSCAD files";
 
-    package = helpers.mkPluginPackageOption "openscad.nvim" pkgs.vimPlugins.openscad-nvim;
+    package = lib.mkPackageOption pkgs "openscad.nvim" {
+      default = [
+        "vimPlugins"
+        "openscad-nvim"
+      ];
+    };
 
     fuzzyFinder = helpers.defaultNullOpts.mkEnum [
       "skim"

plugins/languages/plantuml-syntax.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.plantuml-syntax = {
     enable = mkEnableOption "plantuml syntax support";
 
-    package = helpers.mkPluginPackageOption "plantuml-syntax" pkgs.vimPlugins.plantuml-syntax;
+    package = lib.mkPackageOption pkgs "plantuml-syntax" {
+      default = [
+        "vimPlugins"
+        "plantuml-syntax"
+      ];
+    };
 
     setMakeprg = mkOption {
       type = types.bool;

plugins/languages/rust/rust-tools.nix

@@ -12,7 +12,12 @@ in
 {
   options.plugins.rust-tools = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rust tools plugins";
-    package = helpers.mkPluginPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
+    package = lib.mkPackageOption pkgs "rust-tools" {
+      default = [
+        "vimPlugins"
+        "rust-tools-nvim"
+      ];
+    };
     serverPackage = lib.mkPackageOption pkgs "rust-analyzer" {
       nullable = true;
     };

plugins/languages/treesitter/hmts.nix

@@ -15,7 +15,12 @@ in
   options.plugins.hmts = {
     enable = mkEnableOption "hmts.nvim";
 
-    package = helpers.mkPluginPackageOption "hmts.nvim" pkgs.vimPlugins.hmts-nvim;
+    package = lib.mkPackageOption pkgs "hmts.nvim" {
+      default = [
+        "vimPlugins"
+        "hmts-nvim"
+      ];
+    };
   };
 
   config = mkIf cfg.enable {

plugins/languages/treesitter/rainbow-delimiters.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.rainbow-delimiters = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rainbow-delimiters.nvim";
 
-    package = helpers.mkPluginPackageOption "rainbow-delimiters.nvim" pkgs.vimPlugins.rainbow-delimiters-nvim;
+    package = lib.mkPackageOption pkgs "rainbow-delimiters.nvim" {
+      default = [
+        "vimPlugins"
+        "rainbow-delimiters-nvim"
+      ];
+    };
 
     strategy = helpers.defaultNullOpts.mkAttrsOf' {
       type = types.enum [

plugins/languages/treesitter/treesitter-refactor.nix

@@ -18,7 +18,12 @@ with lib;
     {
       enable = mkEnableOption "treesitter-refactor (requires plugins.treesitter.enable to be true)";
 
-      package = helpers.mkPluginPackageOption "treesitter-refactor" pkgs.vimPlugins.nvim-treesitter-refactor;
+      package = lib.mkPackageOption pkgs "treesitter-refactor" {
+        default = [
+          "vimPlugins"
+          "nvim-treesitter-refactor"
+        ];
+      };
 
       highlightDefinitions = {
         inherit disable;

plugins/languages/treesitter/treesitter-textobjects.nix

@@ -41,7 +41,12 @@ with lib;
     // {
       enable = mkEnableOption "treesitter-textobjects (requires plugins.treesitter.enable to be true)";
 
-      package = helpers.mkPluginPackageOption "treesitter-textobjects" pkgs.vimPlugins.nvim-treesitter-textobjects;
+      package = lib.mkPackageOption pkgs "treesitter-textobjects" {
+        default = [
+          "vimPlugins"
+          "nvim-treesitter-textobjects"
+        ];
+      };
 
       select = {
         enable = helpers.defaultNullOpts.mkBool false ''

plugins/languages/treesitter/ts-context-commentstring.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.ts-context-commentstring = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-ts-context-commentstring";
 
-    package = helpers.mkPluginPackageOption "ts-context-commentstring" pkgs.vimPlugins.nvim-ts-context-commentstring;
+    package = lib.mkPackageOption pkgs "ts-context-commentstring" {
+      default = [
+        "vimPlugins"
+        "nvim-ts-context-commentstring"
+      ];
+    };
 
     skipTsContextCommentStringModule = mkOption {
       type = types.bool;

plugins/languages/typescript-tools.nix

@@ -12,7 +12,12 @@ in
 {
   options.plugins.typescript-tools = {
     enable = mkEnableOption "typescript-tools";
-    package = helpers.mkPluginPackageOption "typescript-tools" pkgs.vimPlugins.typescript-tools-nvim;
+    package = lib.mkPackageOption pkgs "typescript-tools" {
+      default = [
+        "vimPlugins"
+        "typescript-tools-nvim"
+      ];
+    };
 
     onAttach = helpers.defaultNullOpts.mkLuaFn "__lspOnAttach" "Lua code to run when tsserver attaches to a buffer.";
     handlers = mkOption {

plugins/lsp/fidget.nix

@@ -145,7 +145,12 @@ in
     plugins.fidget = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "fidget-nvim";
 
-      package = helpers.mkPluginPackageOption "fidget-nvim" pkgs.vimPlugins.fidget-nvim;
+      package = lib.mkPackageOption pkgs "fidget-nvim" {
+        default = [
+          "vimPlugins"
+          "fidget-nvim"
+        ];
+      };
 
       # Options related to LSP progress subsystem
       progress = {

plugins/lsp/inc-rename.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.inc-rename = {
     enable = mkEnableOption "inc-rename, a plugin previewing LSP renaming";
 
-    package = helpers.mkPluginPackageOption "inc-rename" pkgs.vimPlugins.inc-rename-nvim;
+    package = lib.mkPackageOption pkgs "inc-rename" {
+      default = [
+        "vimPlugins"
+        "inc-rename-nvim"
+      ];
+    };
 
     cmdName = helpers.defaultNullOpts.mkStr "IncRename" "the name of the command";
 

plugins/lsp/language-servers/efmls-configs.nix

@@ -13,7 +13,12 @@ in
   options.plugins.efmls-configs = {
     enable = lib.mkEnableOption "efmls-configs, premade configurations for efm-langserver";
 
-    package = helpers.mkPluginPackageOption "efmls-configs-nvim" pkgs.vimPlugins.efmls-configs-nvim;
+    package = lib.mkPackageOption pkgs "efmls-configs-nvim" {
+      default = [
+        "vimPlugins"
+        "efmls-configs-nvim"
+      ];
+    };
 
     externallyManagedPackages = lib.mkOption {
       type = with lib.types; either (enum [ "all" ]) (listOf str);

plugins/lsp/lsp-format.nix

@@ -13,7 +13,12 @@ in
   options.plugins.lsp-format = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lsp-format.nvim";
 
-    package = helpers.mkPluginPackageOption "lsp-format.nvim" pkgs.vimPlugins.lsp-format-nvim;
+    package = lib.mkPackageOption pkgs "lsp-format.nvim" {
+      default = [
+        "vimPlugins"
+        "lsp-format-nvim"
+      ];
+    };
 
     setup = mkOption {
       type =

plugins/lsp/lspsaga.nix

@@ -49,7 +49,12 @@ in
     plugins.lspsaga = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "lspsaga.nvim";
 
-      package = helpers.mkPluginPackageOption "lspsaga" pkgs.vimPlugins.lspsaga-nvim;
+      package = lib.mkPackageOption pkgs "lspsaga" {
+        default = [
+          "vimPlugins"
+          "lspsaga-nvim"
+        ];
+      };
 
       iconsPackage = lib.mkPackageOption pkgs [
         "vimPlugins"

plugins/lsp/wtf.nix

@@ -31,7 +31,12 @@ in
     plugins.wtf = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "wtf.nvim";
 
-      package = helpers.mkPluginPackageOption "wtf.nvim" pkgs.vimPlugins.wtf-nvim;
+      package = lib.mkPackageOption pkgs "wtf.nvim" {
+        default = [
+          "vimPlugins"
+          "wtf-nvim"
+        ];
+      };
 
       keymaps = mapAttrs (
         action: defaults:

plugins/snippets/friendly-snippets.nix

@@ -15,7 +15,12 @@ in
   options.plugins.friendly-snippets = {
     enable = mkEnableOption "friendly-snippets";
 
-    package = helpers.mkPluginPackageOption "friendly-snippets" pkgs.vimPlugins.friendly-snippets;
+    package = lib.mkPackageOption pkgs "friendly-snippets" {
+      default = [
+        "vimPlugins"
+        "friendly-snippets"
+      ];
+    };
   };
 
   config = mkIf cfg.enable {

plugins/snippets/luasnip/default.nix

@@ -65,7 +65,12 @@ in
   options.plugins.luasnip = {
     enable = mkEnableOption "luasnip";
 
-    package = helpers.mkPluginPackageOption "luasnip" pkgs.vimPlugins.luasnip;
+    package = lib.mkPackageOption pkgs "luasnip" {
+      default = [
+        "vimPlugins"
+        "luasnip"
+      ];
+    };
 
     settings = mkOption {
       type = with types; attrsOf anything;

plugins/statuslines/lualine.nix

@@ -106,7 +106,12 @@ in
     plugins.lualine = {
       enable = mkEnableOption "lualine";
 
-      package = helpers.mkPluginPackageOption "lualine" pkgs.vimPlugins.lualine-nvim;
+      package = lib.mkPackageOption pkgs "lualine" {
+        default = [
+          "vimPlugins"
+          "lualine-nvim"
+        ];
+      };
 
       gitPackage = lib.mkPackageOption pkgs "git" {
         nullable = true;

plugins/ui/image.nix

@@ -15,7 +15,12 @@ in
   options.plugins.image = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "image.nvim";
 
-    package = helpers.mkPluginPackageOption "image.nvim" pkgs.vimPlugins.image-nvim;
+    package = lib.mkPackageOption pkgs "image.nvim" {
+      default = [
+        "vimPlugins"
+        "image-nvim"
+      ];
+    };
 
     backend =
       helpers.defaultNullOpts.mkEnumFirstDefault

plugins/ui/noice.nix

@@ -17,7 +17,12 @@ with lib;
         vim, regex, lua, bash, markdown, markdown_inline
     '';
 
-    package = helpers.mkPluginPackageOption "noice" pkgs.vimPlugins.noice-nvim;
+    package = lib.mkPackageOption pkgs "noice" {
+      default = [
+        "vimPlugins"
+        "noice-nvim"
+      ];
+    };
 
     cmdline = {
       enabled = helpers.defaultNullOpts.mkBool true "enables Noice cmdline UI";

plugins/utils/alpha.nix

@@ -54,7 +54,12 @@ in
     plugins.alpha = {
       enable = mkEnableOption "alpha-nvim";
 
-      package = helpers.mkPluginPackageOption "alpha-nvim" pkgs.vimPlugins.alpha-nvim;
+      package = lib.mkPackageOption pkgs "alpha-nvim" {
+        default = [
+          "vimPlugins"
+          "alpha-nvim"
+        ];
+      };
 
       # TODO: deprecated 2024-08-29 remove after 24.11
       iconsEnabled = mkOption {

plugins/utils/auto-session.nix

@@ -13,7 +13,12 @@ in
   options.plugins.auto-session = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "auto-session";
 
-    package = helpers.mkPluginPackageOption "auto-session" pkgs.vimPlugins.auto-session;
+    package = lib.mkPackageOption pkgs "auto-session" {
+      default = [
+        "vimPlugins"
+        "auto-session"
+      ];
+    };
 
     logLevel = helpers.defaultNullOpts.mkEnum [
       "debug"

plugins/utils/autoclose.nix

@@ -15,7 +15,12 @@ in
   options.plugins.autoclose = {
     enable = mkEnableOption "autoclose.nvim";
 
-    package = helpers.mkPluginPackageOption "autoclose.nvim" pkgs.vimPlugins.autoclose-nvim;
+    package = lib.mkPackageOption pkgs "autoclose.nvim" {
+      default = [
+        "vimPlugins"
+        "autoclose-nvim"
+      ];
+    };
 
     keys = helpers.mkNullOrOption (with types; attrsOf anything) ''
       Configures various options, such as shortcuts for pairs, what pair of characters to use in the

plugins/utils/clipboard-image.nix

@@ -88,7 +88,12 @@ in
   options.plugins.clipboard-image = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "clipboard-image.nvim";
 
-    package = helpers.mkPluginPackageOption "clipboard-image.nvim" pkgs.vimPlugins.clipboard-image-nvim;
+    package = lib.mkPackageOption pkgs "clipboard-image.nvim" {
+      default = [
+        "vimPlugins"
+        "clipboard-image-nvim"
+      ];
+    };
 
     clipboardPackage = mkOption {
       type = with types; nullOr package;

plugins/utils/commentary.nix

@@ -16,7 +16,12 @@ in
     plugins.commentary = {
       enable = mkEnableOption "commentary";
 
-      package = helpers.mkPluginPackageOption "commentary" pkgs.vimPlugins.vim-commentary;
+      package = lib.mkPackageOption pkgs "commentary" {
+        default = [
+          "vimPlugins"
+          "vim-commentary"
+        ];
+      };
     };
   };
 

plugins/utils/conjure.nix

@@ -13,7 +13,12 @@ in
   options.plugins.conjure = {
     enable = mkEnableOption "Conjure";
 
-    package = helpers.mkPluginPackageOption "conjure" pkgs.vimPlugins.conjure;
+    package = lib.mkPackageOption pkgs "conjure" {
+      default = [
+        "vimPlugins"
+        "conjure"
+      ];
+    };
   };
 
   config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

plugins/utils/coverage.nix

@@ -63,7 +63,12 @@ in
   options.plugins.coverage = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-coverage";
 
-    package = helpers.mkPluginPackageOption "nvim-coverage" pkgs.vimPlugins.nvim-coverage;
+    package = lib.mkPackageOption pkgs "nvim-coverage" {
+      default = [
+        "vimPlugins"
+        "nvim-coverage"
+      ];
+    };
 
     keymapsSilent = mkOption {
       type = types.bool;

plugins/utils/cursorline.nix

@@ -13,7 +13,12 @@ in
   options.plugins.cursorline = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-cursorline";
 
-    package = helpers.mkPluginPackageOption "nvim-cursorline" pkgs.vimPlugins.nvim-cursorline;
+    package = lib.mkPackageOption pkgs "nvim-cursorline" {
+      default = [
+        "vimPlugins"
+        "nvim-cursorline"
+      ];
+    };
 
     cursorline = {
       enable = helpers.defaultNullOpts.mkBool true "Show / hide cursorline in connection with cursor moving.";

plugins/utils/easyescape.nix

@@ -14,7 +14,12 @@ in
     plugins.easyescape = {
       enable = mkEnableOption "easyescape";
 
-      package = helpers.mkPluginPackageOption "easyescape" pkgs.vimPlugins.vim-easyescape;
+      package = lib.mkPackageOption pkgs "easyescape" {
+        default = [
+          "vimPlugins"
+          "vim-easyescape"
+        ];
+      };
     };
   };
   config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

plugins/utils/floaterm.nix

@@ -200,7 +200,12 @@ in
     {
       enable = mkEnableOption "floaterm";
 
-      package = helpers.mkPluginPackageOption "floaterm" pkgs.vimPlugins.vim-floaterm;
+      package = lib.mkPackageOption pkgs "floaterm" {
+        default = [
+          "vimPlugins"
+          "vim-floaterm"
+        ];
+      };
 
       keymaps = keymapOptions;
     }

plugins/utils/hardtime.nix

@@ -14,7 +14,12 @@ in
     plugins.hardtime = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "hardtime";
 
-      package = helpers.mkPluginPackageOption "hardtime" pkgs.vimPlugins.hardtime-nvim;
+      package = lib.mkPackageOption pkgs "hardtime" {
+        default = [
+          "vimPlugins"
+          "hardtime-nvim"
+        ];
+      };
 
       maxTime = helpers.defaultNullOpts.mkUnsignedInt 1000 ''
         Maximum time (in milliseconds) to consider key presses as repeated.

plugins/utils/harpoon.nix

@@ -25,7 +25,12 @@ in
   options.plugins.harpoon = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "harpoon";
 
-    package = helpers.mkPluginPackageOption "harpoon" pkgs.vimPlugins.harpoon;
+    package = lib.mkPackageOption pkgs "harpoon" {
+      default = [
+        "vimPlugins"
+        "harpoon"
+      ];
+    };
 
     enableTelescope = mkEnableOption "telescope integration";
 

plugins/utils/illuminate.nix

@@ -87,7 +87,12 @@ in
     // {
       enable = mkEnableOption "vim-illuminate";
 
-      package = mkPluginPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate;
+      package = lib.mkPackageOption pkgs "vim-illuminate" {
+        default = [
+          "vimPlugins"
+          "vim-illuminate"
+        ];
+      };
 
       filetypeOverrides =
         helpers.defaultNullOpts.mkAttrsOf (types.submodule { options = commonOptions; }) { }

plugins/utils/intellitab.nix

@@ -14,7 +14,12 @@ in
     plugins.intellitab = {
       enable = mkEnableOption "intellitab.nvim";
 
-      package = helpers.mkPluginPackageOption "intellitab.nvim" pkgs.vimPlugins.intellitab-nvim;
+      package = lib.mkPackageOption pkgs "intellitab.nvim" {
+        default = [
+          "vimPlugins"
+          "intellitab-nvim"
+        ];
+      };
     };
   };
 

plugins/utils/lastplace.nix

@@ -13,7 +13,12 @@ with lib;
   options.plugins.lastplace = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lastplace";
 
-    package = helpers.mkPluginPackageOption "lastplace" pkgs.vimPlugins.nvim-lastplace;
+    package = lib.mkPackageOption pkgs "lastplace" {
+      default = [
+        "vimPlugins"
+        "nvim-lastplace"
+      ];
+    };
 
     ignoreBuftype = helpers.defaultNullOpts.mkListOf types.str [
       "quickfix"

plugins/utils/leap.nix

@@ -13,7 +13,12 @@ in
   options.plugins.leap = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "leap.nvim";
 
-    package = helpers.mkPluginPackageOption "leap.nvim" pkgs.vimPlugins.leap-nvim;
+    package = lib.mkPackageOption pkgs "leap.nvim" {
+      default = [
+        "vimPlugins"
+        "leap-nvim"
+      ];
+    };
 
     addDefaultMappings = mkOption {
       type = types.bool;

plugins/utils/mark-radar.nix

@@ -13,7 +13,12 @@ in
   options.plugins.mark-radar = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "mark-radar";
 
-    package = helpers.mkPluginPackageOption "mark-radar" pkgs.vimPlugins.mark-radar-nvim;
+    package = lib.mkPackageOption pkgs "mark-radar" {
+      default = [
+        "vimPlugins"
+        "mark-radar-nvim"
+      ];
+    };
 
     setDefaultMappings = helpers.defaultNullOpts.mkBool true "Whether to set default mappings.";
 

plugins/utils/marks.nix

@@ -15,7 +15,12 @@ in
   options.plugins.marks = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "marks.nvim";
 
-    package = helpers.mkPluginPackageOption "marks.nvim" pkgs.vimPlugins.marks-nvim;
+    package = lib.mkPackageOption pkgs "marks.nvim" {
+      default = [
+        "vimPlugins"
+        "marks-nvim"
+      ];
+    };
 
     builtinMarks =
       helpers.defaultNullOpts.mkListOf

plugins/utils/mini.nix

@@ -13,7 +13,12 @@ in
   options.plugins.mini = {
     enable = mkEnableOption "mini.nvim";
 
-    package = helpers.mkPluginPackageOption "mini.nvim" pkgs.vimPlugins.mini-nvim;
+    package = lib.mkPackageOption pkgs "mini.nvim" {
+      default = [
+        "vimPlugins"
+        "mini-nvim"
+      ];
+    };
 
     modules = mkOption {
       type = with types; attrsOf attrs;

plugins/utils/mkdnflow.nix

@@ -13,7 +13,12 @@ in
   options.plugins.mkdnflow = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "mkdnflow.nvim";
 
-    package = helpers.mkPluginPackageOption "mkdnflow.nvim" pkgs.vimPlugins.mkdnflow-nvim;
+    package = lib.mkPackageOption pkgs "mkdnflow.nvim" {
+      default = [
+        "vimPlugins"
+        "mkdnflow-nvim"
+      ];
+    };
 
     modules =
       mapAttrs

plugins/utils/multicursors.nix

@@ -48,7 +48,12 @@ in
     plugins.multicursors = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "multicursors.nvim";
 
-      package = helpers.mkPluginPackageOption "multicursors.nvim" pkgs.vimPlugins.multicursors-nvim;
+      package = lib.mkPackageOption pkgs "multicursors.nvim" {
+        default = [
+          "vimPlugins"
+          "multicursors-nvim"
+        ];
+      };
 
       debugMode = helpers.defaultNullOpts.mkBool false "Enable debug mode.";
 

plugins/utils/navbuddy.nix

@@ -16,7 +16,12 @@ in
   options.plugins.navbuddy = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-navbuddy";
 
-    package = helpers.mkPluginPackageOption "nvim-navbuddy" pkgs.vimPlugins.nvim-navbuddy;
+    package = lib.mkPackageOption pkgs "nvim-navbuddy" {
+      default = [
+        "vimPlugins"
+        "nvim-navbuddy"
+      ];
+    };
 
     window = {
       border = helpers.defaultNullOpts.mkBorder "rounded" "window border" ''

plugins/utils/neogen.nix

@@ -47,7 +47,12 @@ in
   options.plugins.neogen = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "neogen";
 
-    package = helpers.mkPluginPackageOption "neogen" pkgs.vimPlugins.neogen;
+    package = lib.mkPackageOption pkgs "neogen" {
+      default = [
+        "vimPlugins"
+        "neogen"
+      ];
+    };
 
     keymaps = mapAttrs (
       optionsName: properties: helpers.mkNullOrOption types.str properties.description

plugins/utils/neorg.nix

@@ -13,7 +13,12 @@ with lib;
   options.plugins.neorg = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "neorg";
 
-    package = helpers.mkPluginPackageOption "neorg" pkgs.vimPlugins.neorg;
+    package = lib.mkPackageOption pkgs "neorg" {
+      default = [
+        "vimPlugins"
+        "neorg"
+      ];
+    };
 
     lazyLoading = helpers.defaultNullOpts.mkBool false '''';
 

plugins/utils/netman.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.netman = {
     enable = mkEnableOption "netman.nvim, a framework to access remote resources";
 
-    package = helpers.mkPluginPackageOption "netman.nvim" pkgs.vimPlugins.netman-nvim;
+    package = lib.mkPackageOption pkgs "netman.nvim" {
+      default = [
+        "vimPlugins"
+        "netman-nvim"
+      ];
+    };
 
     neoTreeIntegration = mkEnableOption "support for netman as a neo-tree source";
   };

plugins/utils/nix-develop.nix

@@ -13,7 +13,12 @@ in
   options.plugins.nix-develop = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nix-develop.nvim";
 
-    package = helpers.mkPluginPackageOption "nix-develop.nvim" pkgs.vimPlugins.nix-develop-nvim;
+    package = lib.mkPackageOption pkgs "nix-develop.nvim" {
+      default = [
+        "vimPlugins"
+        "nix-develop-nvim"
+      ];
+    };
 
     ignoredVariables = mkOption {
       type = with types; attrsOf bool;

plugins/utils/notify.nix

@@ -13,7 +13,12 @@ in
   options.plugins.notify = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-notify";
 
-    package = helpers.mkPluginPackageOption "nvim-notify" pkgs.vimPlugins.nvim-notify;
+    package = lib.mkPackageOption pkgs "nvim-notify" {
+      default = [
+        "vimPlugins"
+        "nvim-notify"
+      ];
+    };
 
     level = helpers.defaultNullOpts.mkLogLevel "info" ''
       Minimum log level to display. See `vim.log.levels`.

plugins/utils/nvim-bqf.nix

@@ -13,7 +13,12 @@ in
   options.plugins.nvim-bqf = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-bqf";
 
-    package = helpers.mkPluginPackageOption "nvim-bqf" pkgs.vimPlugins.nvim-bqf;
+    package = lib.mkPackageOption pkgs "nvim-bqf" {
+      default = [
+        "vimPlugins"
+        "nvim-bqf"
+      ];
+    };
 
     autoEnable = helpers.defaultNullOpts.mkBool true ''
       Enable nvim-bqf in quickfix window automatically.

plugins/utils/nvim-colorizer.nix

@@ -104,7 +104,12 @@ in
     plugins.nvim-colorizer = {
       enable = mkEnableOption "nvim-colorizer";
 
-      package = helpers.mkPluginPackageOption "nvim-colorizer" pkgs.vimPlugins.nvim-colorizer-lua;
+      package = lib.mkPackageOption pkgs "nvim-colorizer" {
+        default = [
+          "vimPlugins"
+          "nvim-colorizer-lua"
+        ];
+      };
 
       fileTypes = mkOption {
         description = "Enable and/or configure highlighting for certain filetypes";

plugins/utils/nvim-osc52.nix

@@ -27,7 +27,12 @@ with lib;
       '';
     };
 
-    package = helpers.mkPluginPackageOption "nvim-osc52" pkgs.vimPlugins.nvim-osc52;
+    package = lib.mkPackageOption pkgs "nvim-osc52" {
+      default = [
+        "vimPlugins"
+        "nvim-osc52"
+      ];
+    };
 
     maxLength = helpers.defaultNullOpts.mkInt 0 "Maximum length of selection (0 for no limit)";
     silent = helpers.defaultNullOpts.mkBool false "Disable message on successful copy";

plugins/utils/nvim-ufo.nix

@@ -13,7 +13,12 @@ in
   options.plugins.nvim-ufo = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-ufo";
 
-    package = helpers.mkPluginPackageOption "nvim-ufo" pkgs.vimPlugins.nvim-ufo;
+    package = lib.mkPackageOption pkgs "nvim-ufo" {
+      default = [
+        "vimPlugins"
+        "nvim-ufo"
+      ];
+    };
 
     openFoldHlTimeout = helpers.defaultNullOpts.mkInt 400 ''
       Time in millisecond between the range to be highlgihted and to be cleared

plugins/utils/ollama.nix

@@ -63,7 +63,12 @@ in
   options.plugins.ollama = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "ollama.nvim";
 
-    package = helpers.mkPluginPackageOption "ollama.nvim" pkgs.vimPlugins.ollama-nvim;
+    package = lib.mkPackageOption pkgs "ollama.nvim" {
+      default = [
+        "vimPlugins"
+        "ollama-nvim"
+      ];
+    };
 
     model = helpers.defaultNullOpts.mkStr "mistral" ''
       The default model to use.

plugins/utils/persistence.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.persistence = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "persistence.nvim";
 
-    package = helpers.mkPluginPackageOption "persistence.nvim" pkgs.vimPlugins.persistence-nvim;
+    package = lib.mkPackageOption pkgs "persistence.nvim" {
+      default = [
+        "vimPlugins"
+        "persistence-nvim"
+      ];
+    };
 
     dir = helpers.defaultNullOpts.mkStr {
       __raw = ''vim.fn.expand(vim.fn.stdpath("state") .. "/sessions/")'';

plugins/utils/presence-nvim.nix

@@ -13,7 +13,12 @@ in
   options = {
     plugins.presence-nvim = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "presence-nvim";
-      package = helpers.mkPluginPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
+      package = lib.mkPackageOption pkgs "presence-nvim" {
+        default = [
+          "vimPlugins"
+          "presence-nvim"
+        ];
+      };
 
       # General options.
       autoUpdate = helpers.defaultNullOpts.mkBool true ''

plugins/utils/quickmath.nix

@@ -13,7 +13,12 @@ in
   options.plugins.quickmath = {
     enable = mkEnableOption "quickmath.nvim";
 
-    package = helpers.mkPluginPackageOption "quickmath.nvim" pkgs.vimPlugins.quickmath-nvim;
+    package = lib.mkPackageOption pkgs "quickmath.nvim" {
+      default = [
+        "vimPlugins"
+        "quickmath-nvim"
+      ];
+    };
 
     keymap = {
       key = helpers.mkNullOrOption types.str "Keymap to run the `:Quickmath` command.";

plugins/utils/spider.nix

@@ -14,7 +14,12 @@ in
   options.plugins.${pluginName} = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption pluginName;
 
-    package = helpers.mkPluginPackageOption pluginName pkgs.vimPlugins.nvim-spider;
+    package = lib.mkPackageOption pkgs pluginName {
+      default = [
+        "vimPlugins"
+        "nvim-spider"
+      ];
+    };
 
     skipInsignificantPunctuation = helpers.defaultNullOpts.mkBool true "Whether to skip insignificant punctuation.";
 

plugins/utils/startup.nix

@@ -15,7 +15,12 @@ in
   options.plugins.startup = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "startup.nvim";
 
-    package = helpers.mkPluginPackageOption "startup.nvim" pkgs.vimPlugins.startup-nvim;
+    package = lib.mkPackageOption pkgs "startup.nvim" {
+      default = [
+        "vimPlugins"
+        "startup-nvim"
+      ];
+    };
 
     theme = helpers.defaultNullOpts.mkStr "dashboard" ''
       Use a pre-defined theme.

plugins/utils/vim-bbye.nix

@@ -13,7 +13,12 @@ in
   options.plugins.vim-bbye = {
     enable = mkEnableOption "vim-bbye";
 
-    package = helpers.mkPluginPackageOption "vim-bbye" pkgs.vimPlugins.vim-bbye;
+    package = lib.mkPackageOption pkgs "vim-bbye" {
+      default = [
+        "vimPlugins"
+        "vim-bbye"
+      ];
+    };
 
     keymapsSilent = mkOption {
       type = types.bool;

plugins/utils/vim-matchup.nix

@@ -10,7 +10,12 @@ with lib;
   options.plugins.vim-matchup = {
     enable = mkEnableOption "vim-matchup";
 
-    package = helpers.mkPluginPackageOption "vim-matchup" pkgs.vimPlugins.vim-matchup;
+    package = lib.mkPackageOption pkgs "vim-matchup" {
+      default = [
+        "vimPlugins"
+        "vim-matchup"
+      ];
+    };
 
     treesitterIntegration = {
       enable = mkEnableOption "treesitter integration";

plugins/utils/wilder.nix

@@ -66,7 +66,12 @@ in
   options.plugins.wilder = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "wilder-nvim";
 
-    package = helpers.mkPluginPackageOption "wilder-nvim" pkgs.vimPlugins.wilder-nvim;
+    package = lib.mkPackageOption pkgs "wilder-nvim" {
+      default = [
+        "vimPlugins"
+        "wilder-nvim"
+      ];
+    };
 
     ### Setup options ###
     enableCmdlineEnter = helpers.defaultNullOpts.mkBool true ''