diff --git a/plugins/colorschemes/dracula.nix b/plugins/colorschemes/dracula.nix
index f7e69320..92f66d3b 100644
--- a/plugins/colorschemes/dracula.nix
+++ b/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;
diff --git a/plugins/completion/copilot-lua.nix b/plugins/completion/copilot-lua.nix
index f8eb0b68..4f0411dc 100644
--- a/plugins/completion/copilot-lua.nix
+++ b/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.";
diff --git a/plugins/completion/coq-thirdparty.nix b/plugins/completion/coq-thirdparty.nix
index 0ebea6a4..88b51068 100644
--- a/plugins/completion/coq-thirdparty.nix
+++ b/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 (
diff --git a/plugins/completion/lspkind.nix b/plugins/completion/lspkind.nix
index 19f75f17..c43cada9 100644
--- a/plugins/completion/lspkind.nix
+++ b/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"
diff --git a/plugins/filetrees/chadtree.nix b/plugins/filetrees/chadtree.nix
index 21dcebf8..a975c825 100644
--- a/plugins/filetrees/chadtree.nix
+++ b/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"
diff --git a/plugins/filetrees/neo-tree.nix b/plugins/filetrees/neo-tree.nix
index 7bfb5391..1b014e87 100644
--- a/plugins/filetrees/neo-tree.nix
+++ b/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"
diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix
index cd1e4e0f..1db9b6e2 100644
--- a/plugins/filetrees/nvim-tree.nix
+++ b/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"
diff --git a/plugins/git/diffview.nix b/plugins/git/diffview.nix
index 127e14a4..c72fdaed 100644
--- a/plugins/git/diffview.nix
+++ b/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"
diff --git a/plugins/git/git-worktree.nix b/plugins/git/git-worktree.nix
index bde0b75d..bddcc422 100644
--- a/plugins/git/git-worktree.nix
+++ b/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;
diff --git a/plugins/git/gitgutter.nix b/plugins/git/gitgutter.nix
index 8c5338db..bf669ae7 100644
--- a/plugins/git/gitgutter.nix
+++ b/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;
diff --git a/plugins/git/gitlinker.nix b/plugins/git/gitlinker.nix
index 3543317a..50e3b1ce 100644
--- a/plugins/git/gitlinker.nix
+++ b/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.";
 
diff --git a/plugins/git/gitmessenger.nix b/plugins/git/gitmessenger.nix
index a7d63b61..f06bb9f5 100644
--- a/plugins/git/gitmessenger.nix
+++ b/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
diff --git a/plugins/languages/clangd-extensions.nix b/plugins/languages/clangd-extensions.nix
index 7f681536..584c45f4 100644
--- a/plugins/languages/clangd-extensions.nix
+++ b/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:
diff --git a/plugins/languages/helm.nix b/plugins/languages/helm.nix
index a4783cdc..e12b0476 100644
--- a/plugins/languages/helm.nix
+++ b/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 ]; };
diff --git a/plugins/languages/lean.nix b/plugins/languages/lean.nix
index 645c02e9..7113418f 100644
--- a/plugins/languages/lean.nix
+++ b/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;
diff --git a/plugins/languages/lint.nix b/plugins/languages/lint.nix
index da9e7214..9ea2f68f 100644
--- a/plugins/languages/lint.nix
+++ b/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);
diff --git a/plugins/languages/nvim-jdtls.nix b/plugins/languages/nvim-jdtls.nix
index 35ff376a..fc0baa88 100644
--- a/plugins/languages/nvim-jdtls.nix
+++ b/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.
diff --git a/plugins/languages/openscad.nix b/plugins/languages/openscad.nix
index b6554ff5..d6e1300f 100644
--- a/plugins/languages/openscad.nix
+++ b/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"
diff --git a/plugins/languages/plantuml-syntax.nix b/plugins/languages/plantuml-syntax.nix
index 46a865fb..a9771645 100644
--- a/plugins/languages/plantuml-syntax.nix
+++ b/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;
diff --git a/plugins/languages/rust/rust-tools.nix b/plugins/languages/rust/rust-tools.nix
index 55ce6075..539d5173 100644
--- a/plugins/languages/rust/rust-tools.nix
+++ b/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;
     };
diff --git a/plugins/languages/treesitter/hmts.nix b/plugins/languages/treesitter/hmts.nix
index ecc707ae..6762f508 100644
--- a/plugins/languages/treesitter/hmts.nix
+++ b/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 {
diff --git a/plugins/languages/treesitter/rainbow-delimiters.nix b/plugins/languages/treesitter/rainbow-delimiters.nix
index e408a72f..1d6b5e7f 100644
--- a/plugins/languages/treesitter/rainbow-delimiters.nix
+++ b/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 [
diff --git a/plugins/languages/treesitter/treesitter-refactor.nix b/plugins/languages/treesitter/treesitter-refactor.nix
index 17f8cdaa..5ab0c1ff 100644
--- a/plugins/languages/treesitter/treesitter-refactor.nix
+++ b/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;
diff --git a/plugins/languages/treesitter/treesitter-textobjects.nix b/plugins/languages/treesitter/treesitter-textobjects.nix
index 8e6e55b3..a9b8e8db 100644
--- a/plugins/languages/treesitter/treesitter-textobjects.nix
+++ b/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 ''
diff --git a/plugins/languages/treesitter/ts-context-commentstring.nix b/plugins/languages/treesitter/ts-context-commentstring.nix
index 9455789f..43b74f6b 100644
--- a/plugins/languages/treesitter/ts-context-commentstring.nix
+++ b/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;
diff --git a/plugins/languages/typescript-tools.nix b/plugins/languages/typescript-tools.nix
index ffe94d43..197bb2d7 100644
--- a/plugins/languages/typescript-tools.nix
+++ b/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 {
diff --git a/plugins/lsp/fidget.nix b/plugins/lsp/fidget.nix
index 55046bd1..c95724a5 100644
--- a/plugins/lsp/fidget.nix
+++ b/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 = {
diff --git a/plugins/lsp/inc-rename.nix b/plugins/lsp/inc-rename.nix
index b1062d20..1a23fa81 100644
--- a/plugins/lsp/inc-rename.nix
+++ b/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";
 
diff --git a/plugins/lsp/language-servers/efmls-configs.nix b/plugins/lsp/language-servers/efmls-configs.nix
index 2ab20e78..80d6f46d 100644
--- a/plugins/lsp/language-servers/efmls-configs.nix
+++ b/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);
diff --git a/plugins/lsp/lsp-format.nix b/plugins/lsp/lsp-format.nix
index 73cd4204..b6d70887 100644
--- a/plugins/lsp/lsp-format.nix
+++ b/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 =
diff --git a/plugins/lsp/lspsaga.nix b/plugins/lsp/lspsaga.nix
index 67531d72..ebc94f9b 100644
--- a/plugins/lsp/lspsaga.nix
+++ b/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"
diff --git a/plugins/lsp/wtf.nix b/plugins/lsp/wtf.nix
index 658847ac..07af8ec2 100644
--- a/plugins/lsp/wtf.nix
+++ b/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:
diff --git a/plugins/snippets/friendly-snippets.nix b/plugins/snippets/friendly-snippets.nix
index b12c8c2f..444e1c96 100644
--- a/plugins/snippets/friendly-snippets.nix
+++ b/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 {
diff --git a/plugins/snippets/luasnip/default.nix b/plugins/snippets/luasnip/default.nix
index e4f47a49..7004b078 100644
--- a/plugins/snippets/luasnip/default.nix
+++ b/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;
diff --git a/plugins/statuslines/lualine.nix b/plugins/statuslines/lualine.nix
index c0cbec36..1c7c5aba 100644
--- a/plugins/statuslines/lualine.nix
+++ b/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;
diff --git a/plugins/ui/image.nix b/plugins/ui/image.nix
index d5cd54a8..edcf1e35 100644
--- a/plugins/ui/image.nix
+++ b/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
diff --git a/plugins/ui/noice.nix b/plugins/ui/noice.nix
index fad9c0f2..c5850324 100644
--- a/plugins/ui/noice.nix
+++ b/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";
diff --git a/plugins/utils/alpha.nix b/plugins/utils/alpha.nix
index 6f69ec1b..38b16532 100644
--- a/plugins/utils/alpha.nix
+++ b/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 {
diff --git a/plugins/utils/auto-session.nix b/plugins/utils/auto-session.nix
index 72f4d0de..e46712fb 100644
--- a/plugins/utils/auto-session.nix
+++ b/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"
diff --git a/plugins/utils/autoclose.nix b/plugins/utils/autoclose.nix
index a0b1b6cc..6b6733f7 100644
--- a/plugins/utils/autoclose.nix
+++ b/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
diff --git a/plugins/utils/clipboard-image.nix b/plugins/utils/clipboard-image.nix
index 495b6296..07ea1a36 100644
--- a/plugins/utils/clipboard-image.nix
+++ b/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;
diff --git a/plugins/utils/commentary.nix b/plugins/utils/commentary.nix
index a00d1ae3..a2705381 100644
--- a/plugins/utils/commentary.nix
+++ b/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"
+        ];
+      };
     };
   };
 
diff --git a/plugins/utils/conjure.nix b/plugins/utils/conjure.nix
index c33fea24..91278a2d 100644
--- a/plugins/utils/conjure.nix
+++ b/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 ]; };
diff --git a/plugins/utils/coverage.nix b/plugins/utils/coverage.nix
index 5e868d10..94e0589d 100644
--- a/plugins/utils/coverage.nix
+++ b/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;
diff --git a/plugins/utils/cursorline.nix b/plugins/utils/cursorline.nix
index 2fa96f4d..8da3d121 100644
--- a/plugins/utils/cursorline.nix
+++ b/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.";
diff --git a/plugins/utils/easyescape.nix b/plugins/utils/easyescape.nix
index d2301cb3..8f8a2c6d 100644
--- a/plugins/utils/easyescape.nix
+++ b/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 ]; };
diff --git a/plugins/utils/floaterm.nix b/plugins/utils/floaterm.nix
index c2d08bed..c9d2e000 100644
--- a/plugins/utils/floaterm.nix
+++ b/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;
     }
diff --git a/plugins/utils/hardtime.nix b/plugins/utils/hardtime.nix
index 8bdcbaf0..cd1d4961 100644
--- a/plugins/utils/hardtime.nix
+++ b/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.
diff --git a/plugins/utils/harpoon.nix b/plugins/utils/harpoon.nix
index 4a1a424e..5807c02f 100644
--- a/plugins/utils/harpoon.nix
+++ b/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";
 
diff --git a/plugins/utils/illuminate.nix b/plugins/utils/illuminate.nix
index 981da3bb..93c7c008 100644
--- a/plugins/utils/illuminate.nix
+++ b/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; }) { }
diff --git a/plugins/utils/intellitab.nix b/plugins/utils/intellitab.nix
index 3a50ead4..4b654649 100644
--- a/plugins/utils/intellitab.nix
+++ b/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"
+        ];
+      };
     };
   };
 
diff --git a/plugins/utils/lastplace.nix b/plugins/utils/lastplace.nix
index 7bf2664c..b22d4f33 100644
--- a/plugins/utils/lastplace.nix
+++ b/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"
diff --git a/plugins/utils/leap.nix b/plugins/utils/leap.nix
index 3ee06c9f..fae8af79 100644
--- a/plugins/utils/leap.nix
+++ b/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;
diff --git a/plugins/utils/mark-radar.nix b/plugins/utils/mark-radar.nix
index 7100fe54..7b3417e4 100644
--- a/plugins/utils/mark-radar.nix
+++ b/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.";
 
diff --git a/plugins/utils/marks.nix b/plugins/utils/marks.nix
index e3bd23a8..44f5e59a 100644
--- a/plugins/utils/marks.nix
+++ b/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
diff --git a/plugins/utils/mini.nix b/plugins/utils/mini.nix
index 1768192f..fadaaba0 100644
--- a/plugins/utils/mini.nix
+++ b/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;
diff --git a/plugins/utils/mkdnflow.nix b/plugins/utils/mkdnflow.nix
index b86ad95c..4858573e 100644
--- a/plugins/utils/mkdnflow.nix
+++ b/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
diff --git a/plugins/utils/multicursors.nix b/plugins/utils/multicursors.nix
index d9ad6375..eb0b24fb 100644
--- a/plugins/utils/multicursors.nix
+++ b/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.";
 
diff --git a/plugins/utils/navbuddy.nix b/plugins/utils/navbuddy.nix
index f88e1823..5deb7372 100644
--- a/plugins/utils/navbuddy.nix
+++ b/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" ''
diff --git a/plugins/utils/neogen.nix b/plugins/utils/neogen.nix
index 5e86327e..b00fdff5 100644
--- a/plugins/utils/neogen.nix
+++ b/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
diff --git a/plugins/utils/neorg.nix b/plugins/utils/neorg.nix
index 879e3e8f..d98e0d5f 100644
--- a/plugins/utils/neorg.nix
+++ b/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 '''';
 
diff --git a/plugins/utils/netman.nix b/plugins/utils/netman.nix
index 75c357ff..20ae2059 100644
--- a/plugins/utils/netman.nix
+++ b/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";
   };
diff --git a/plugins/utils/nix-develop.nix b/plugins/utils/nix-develop.nix
index d7936877..2534faf5 100644
--- a/plugins/utils/nix-develop.nix
+++ b/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;
diff --git a/plugins/utils/notify.nix b/plugins/utils/notify.nix
index fe6e8f39..9c96a5bd 100644
--- a/plugins/utils/notify.nix
+++ b/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`.
diff --git a/plugins/utils/nvim-bqf.nix b/plugins/utils/nvim-bqf.nix
index f5369c57..993943f1 100644
--- a/plugins/utils/nvim-bqf.nix
+++ b/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.
diff --git a/plugins/utils/nvim-colorizer.nix b/plugins/utils/nvim-colorizer.nix
index 2acfe094..39ae41c4 100644
--- a/plugins/utils/nvim-colorizer.nix
+++ b/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";
diff --git a/plugins/utils/nvim-osc52.nix b/plugins/utils/nvim-osc52.nix
index 78162385..9861a08f 100644
--- a/plugins/utils/nvim-osc52.nix
+++ b/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";
diff --git a/plugins/utils/nvim-ufo.nix b/plugins/utils/nvim-ufo.nix
index c9603af1..016d5d67 100644
--- a/plugins/utils/nvim-ufo.nix
+++ b/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
diff --git a/plugins/utils/ollama.nix b/plugins/utils/ollama.nix
index ce214c46..b3540006 100644
--- a/plugins/utils/ollama.nix
+++ b/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.
diff --git a/plugins/utils/persistence.nix b/plugins/utils/persistence.nix
index 52c35bab..90a5aecb 100644
--- a/plugins/utils/persistence.nix
+++ b/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/")'';
diff --git a/plugins/utils/presence-nvim.nix b/plugins/utils/presence-nvim.nix
index a090e03d..b8d68fdd 100644
--- a/plugins/utils/presence-nvim.nix
+++ b/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 ''
diff --git a/plugins/utils/quickmath.nix b/plugins/utils/quickmath.nix
index 3e00d8da..693fc4bc 100644
--- a/plugins/utils/quickmath.nix
+++ b/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.";
diff --git a/plugins/utils/spider.nix b/plugins/utils/spider.nix
index 7c9160ce..36bdae6a 100644
--- a/plugins/utils/spider.nix
+++ b/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.";
 
diff --git a/plugins/utils/startup.nix b/plugins/utils/startup.nix
index 34fb6617..3ae6eebf 100644
--- a/plugins/utils/startup.nix
+++ b/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.
diff --git a/plugins/utils/vim-bbye.nix b/plugins/utils/vim-bbye.nix
index 03d136ac..a574f485 100644
--- a/plugins/utils/vim-bbye.nix
+++ b/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;
diff --git a/plugins/utils/vim-matchup.nix b/plugins/utils/vim-matchup.nix
index 85812c90..63ae7d25 100644
--- a/plugins/utils/vim-matchup.nix
+++ b/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";
diff --git a/plugins/utils/wilder.nix b/plugins/utils/wilder.nix
index c8342b63..5b23dc3b 100644
--- a/plugins/utils/wilder.nix
+++ b/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 ''