diff --git a/modules/nixvim/plugins/dressing-nvim.nix b/modules/nixvim/plugins/dressing-nvim.nix
index 66c159c5..31294eaf 100644
--- a/modules/nixvim/plugins/dressing-nvim.nix
+++ b/modules/nixvim/plugins/dressing-nvim.nix
@@ -7,7 +7,7 @@ in
   options.plugins.dressing-nvim = {
     enable = lib.mkEnableOption "dressing.nvim configuration";
 
-    package = helpers.mkPluginPackageOption "dressing.nvim" pkgs.vimPlugins.dressing-nvim;
+    package = lib.mkPackagePlugin pkgs "vimPlugins.dressing-nvim" { };
 
     settings = lib.mkOption {
       type = with lib.types; attrsOf anything;
diff --git a/modules/nixvim/plugins/legendary-nvim.nix b/modules/nixvim/plugins/legendary-nvim.nix
index cad05d9f..26c01f4b 100644
--- a/modules/nixvim/plugins/legendary-nvim.nix
+++ b/modules/nixvim/plugins/legendary-nvim.nix
@@ -9,7 +9,7 @@ in
   options.plugins.legendary-nvim = {
     enable = lib.mkEnableOption "legendary.nvim";
 
-    package = helpers.mkPluginPackageOption "legendary.nvim" pkgs.vimPlugins.legendary-nvim;
+    package = lib.mkPackageOption pkgs [ "vimPlugins" "legendary-nvim" ] { };
 
     additionalSetup = mkEnableOption' "dependencies for additional features like frecency sorting";
 
diff --git a/modules/nixvim/plugins/lush-nvim.nix b/modules/nixvim/plugins/lush-nvim.nix
index c2373d4a..1f3b6245 100644
--- a/modules/nixvim/plugins/lush-nvim.nix
+++ b/modules/nixvim/plugins/lush-nvim.nix
@@ -63,7 +63,7 @@ in
   options.colorschemes.lush = {
     enable = lib.mkEnableOption "theming with lush.nvim";
 
-    package = helpers.mkPluginPackageOption "lush.nvim" pkgs.vimPlugins.lush-nvim;
+    package = lib.mkPackageOption pkgs [ "vimPlugins" "lush-nvim" ] { };
 
     extraConfigLua = lib.mkOption {
       type = lib.types.lines;
diff --git a/modules/nixvim/plugins/nvim-config-local.nix b/modules/nixvim/plugins/nvim-config-local.nix
index 9c5403b8..20366d27 100644
--- a/modules/nixvim/plugins/nvim-config-local.nix
+++ b/modules/nixvim/plugins/nvim-config-local.nix
@@ -7,7 +7,7 @@ in
   options.plugins.nvim-config-local = {
     enable = lib.mkEnableOption "nvim-config-local";
 
-    package = helpers.mkPluginPackageOption "nvim-config-local" pkgs.vimPlugins.nvim-config-local;
+    package = lib.mkPackageOption pkgs [ "vimPlugins" "nvim-config-local" ] { };
 
     settings = lib.mkOption {
       type = lib.types.submodule {
diff --git a/modules/nixvim/plugins/nvim-remote-containers.nix b/modules/nixvim/plugins/nvim-remote-containers.nix
index f28dcd6f..136b90d8 100644
--- a/modules/nixvim/plugins/nvim-remote-containers.nix
+++ b/modules/nixvim/plugins/nvim-remote-containers.nix
@@ -7,7 +7,7 @@ in
   options.plugins.nvim-remote-containers = {
     enable = lib.mkEnableOption "nvim-remote-containers";
 
-    package = helpers.mkPluginPackageOption "nvim-remote-containers" pkgs.vimPlugins.nvim-remote-containers;
+    package = lib.mkPackageOption pkgs [ "vimPlugins" "nvim-remote-containers" ] { };
   };
 
   config = lib.mkIf cfg.enable {