diff --git a/plugins/by-name/arrow/default.nix b/plugins/by-name/arrow/default.nix
index c3a23848..31649e91 100644
--- a/plugins/by-name/arrow/default.nix
+++ b/plugins/by-name/arrow/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "arrow";
   packPathName = "arrow.nvim";
   package = "arrow-nvim";
diff --git a/plugins/by-name/better-escape/default.nix b/plugins/by-name/better-escape/default.nix
index 12bf57ac..de701d9b 100644
--- a/plugins/by-name/better-escape/default.nix
+++ b/plugins/by-name/better-escape/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "better-escape";
   packPathName = "better-escape.nvim";
   moduleName = "better_escape";
diff --git a/plugins/by-name/chadtree/default.nix b/plugins/by-name/chadtree/default.nix
index ae65ec1e..01e932d2 100644
--- a/plugins/by-name/chadtree/default.nix
+++ b/plugins/by-name/chadtree/default.nix
@@ -12,7 +12,7 @@ let
   mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in
 {
-  options.plugins.chadtree = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.chadtree = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "chadtree";
 
     package = lib.mkPackageOption pkgs "chadtree" {
diff --git a/plugins/by-name/chatgpt/default.nix b/plugins/by-name/chatgpt/default.nix
index 0fe9b16e..c94e76fd 100644
--- a/plugins/by-name/chatgpt/default.nix
+++ b/plugins/by-name/chatgpt/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "chatgpt";
   packPathName = "ChatGPT.nvim";
   package = "ChatGPT-nvim";
diff --git a/plugins/by-name/clangd-extensions/default.nix b/plugins/by-name/clangd-extensions/default.nix
index 584c45f4..f67ebc90 100644
--- a/plugins/by-name/clangd-extensions/default.nix
+++ b/plugins/by-name/clangd-extensions/default.nix
@@ -95,7 +95,7 @@ in
       ]
     );
 
-  options.plugins.clangd-extensions = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.clangd-extensions = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "clangd_extensions, plugins implementing clangd LSP extensions";
 
     package = lib.mkPackageOption pkgs "clangd_extensions.nvim" {
diff --git a/plugins/by-name/clipboard-image/default.nix b/plugins/by-name/clipboard-image/default.nix
index d804fc2d..fa49b30d 100644
--- a/plugins/by-name/clipboard-image/default.nix
+++ b/plugins/by-name/clipboard-image/default.nix
@@ -85,7 +85,7 @@ in
 {
   meta.maintainers = [ maintainers.GaetanLepage ];
 
-  options.plugins.clipboard-image = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.clipboard-image = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "clipboard-image.nvim";
 
     package = lib.mkPackageOption pkgs "clipboard-image.nvim" {
diff --git a/plugins/by-name/cloak/default.nix b/plugins/by-name/cloak/default.nix
index e1e2c587..e24c8aef 100644
--- a/plugins/by-name/cloak/default.nix
+++ b/plugins/by-name/cloak/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "cloak";
   packPathName = "cloak.nvim";
   package = "cloak-nvim";
diff --git a/plugins/by-name/codesnap/default.nix b/plugins/by-name/codesnap/default.nix
index 2964c81b..14a68d47 100644
--- a/plugins/by-name/codesnap/default.nix
+++ b/plugins/by-name/codesnap/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "codesnap";
   packPathName = "codesnap.nvim";
   package = "codesnap-nvim";
diff --git a/plugins/by-name/comment/default.nix b/plugins/by-name/comment/default.nix
index 83591e6d..8799aeae 100644
--- a/plugins/by-name/comment/default.nix
+++ b/plugins/by-name/comment/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "comment";
   packPathName = "Comment.nvim";
   moduleName = "Comment";
diff --git a/plugins/by-name/copilot-chat/default.nix b/plugins/by-name/copilot-chat/default.nix
index 485a2415..10ecb65f 100644
--- a/plugins/by-name/copilot-chat/default.nix
+++ b/plugins/by-name/copilot-chat/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "copilot-chat";
   packPathName = "CopilotChat.nvim";
   moduleName = "CopilotChat";
diff --git a/plugins/by-name/copilot-lua/default.nix b/plugins/by-name/copilot-lua/default.nix
index 4f0411dc..3ee569aa 100644
--- a/plugins/by-name/copilot-lua/default.nix
+++ b/plugins/by-name/copilot-lua/default.nix
@@ -15,7 +15,7 @@ in
       let
         keymapOption = helpers.defaultNullOpts.mkNullable (with types; either (enum [ false ]) str);
       in
-      helpers.neovim-plugin.extraOptionsOptions
+      lib.nixvim.neovim-plugin.extraOptionsOptions
       // {
         enable = mkEnableOption "copilot.lua";
 
diff --git a/plugins/by-name/coverage/default.nix b/plugins/by-name/coverage/default.nix
index e530419f..a6ddf716 100644
--- a/plugins/by-name/coverage/default.nix
+++ b/plugins/by-name/coverage/default.nix
@@ -60,7 +60,7 @@ let
   };
 in
 {
-  options.plugins.coverage = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.coverage = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-coverage";
 
     package = lib.mkPackageOption pkgs "nvim-coverage" {
diff --git a/plugins/by-name/cursorline/default.nix b/plugins/by-name/cursorline/default.nix
index 8da3d121..d9dd60ce 100644
--- a/plugins/by-name/cursorline/default.nix
+++ b/plugins/by-name/cursorline/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.cursorline;
 in
 {
-  options.plugins.cursorline = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.cursorline = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-cursorline";
 
     package = lib.mkPackageOption pkgs "nvim-cursorline" {
diff --git a/plugins/by-name/dap/dap-ui.nix b/plugins/by-name/dap/dap-ui.nix
index e9758481..fa38e8ba 100644
--- a/plugins/by-name/dap/dap-ui.nix
+++ b/plugins/by-name/dap/dap-ui.nix
@@ -56,7 +56,7 @@ let
   };
 in
 {
-  options.plugins.dap.extensions.dap-ui = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.dap.extensions.dap-ui = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "dap-ui";
 
     package = lib.mkPackageOption pkgs "dap-ui" {
diff --git a/plugins/by-name/dap/default.nix b/plugins/by-name/dap/default.nix
index c7d09cbd..c73cb958 100644
--- a/plugins/by-name/dap/default.nix
+++ b/plugins/by-name/dap/default.nix
@@ -19,7 +19,7 @@ with dapHelpers;
     ./dap-virtual-text.nix
   ];
 
-  options.plugins.dap = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.dap = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "dap";
 
     package = lib.mkPackageOption pkgs "dap" {
diff --git a/plugins/by-name/dashboard/default.nix b/plugins/by-name/dashboard/default.nix
index 414831af..1bb97c45 100644
--- a/plugins/by-name/dashboard/default.nix
+++ b/plugins/by-name/dashboard/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "dashboard";
   packPathName = "dashboard-nvim";
   package = "dashboard-nvim";
diff --git a/plugins/by-name/debugprint/default.nix b/plugins/by-name/debugprint/default.nix
index 12750882..6807369b 100644
--- a/plugins/by-name/debugprint/default.nix
+++ b/plugins/by-name/debugprint/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "debugprint";
   packPathName = "debugprint.nvim";
   package = "debugprint-nvim";
diff --git a/plugins/by-name/diffview/default.nix b/plugins/by-name/diffview/default.nix
index e9113586..b45e1115 100644
--- a/plugins/by-name/diffview/default.nix
+++ b/plugins/by-name/diffview/default.nix
@@ -83,7 +83,7 @@ in
 {
   options.plugins.diffview =
     with helpers.defaultNullOpts;
-    helpers.neovim-plugin.extraOptionsOptions
+    lib.nixvim.neovim-plugin.extraOptionsOptions
     // {
       enable = mkEnableOption "diffview";
 
diff --git a/plugins/by-name/edgy/default.nix b/plugins/by-name/edgy/default.nix
index 810d95c3..5c31b7a6 100644
--- a/plugins/by-name/edgy/default.nix
+++ b/plugins/by-name/edgy/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "edgy";
   packPathName = "edgy.nvim";
   package = "edgy-nvim";
diff --git a/plugins/by-name/fidget/default.nix b/plugins/by-name/fidget/default.nix
index 03d8118b..de30a327 100644
--- a/plugins/by-name/fidget/default.nix
+++ b/plugins/by-name/fidget/default.nix
@@ -142,7 +142,7 @@ in
       ];
 
   options = {
-    plugins.fidget = helpers.neovim-plugin.extraOptionsOptions // {
+    plugins.fidget = lib.nixvim.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "fidget-nvim";
 
       package = lib.mkPackageOption pkgs "fidget-nvim" {
diff --git a/plugins/by-name/flash/default.nix b/plugins/by-name/flash/default.nix
index 7eee6d78..f05afb3b 100644
--- a/plugins/by-name/flash/default.nix
+++ b/plugins/by-name/flash/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "flash";
   packPathName = "flash.nvim";
   package = "flash-nvim";
diff --git a/plugins/by-name/fzf-lua/default.nix b/plugins/by-name/fzf-lua/default.nix
index 9b3ede2d..928e3437 100644
--- a/plugins/by-name/fzf-lua/default.nix
+++ b/plugins/by-name/fzf-lua/default.nix
@@ -31,7 +31,7 @@ let
     };
   };
 in
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "fzf-lua";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/by-name/git-conflict/default.nix b/plugins/by-name/git-conflict/default.nix
index 16bc23ba..6298d02b 100644
--- a/plugins/by-name/git-conflict/default.nix
+++ b/plugins/by-name/git-conflict/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "git-conflict";
   packPathName = "git-conflict.nvim";
   package = "git-conflict-nvim";
diff --git a/plugins/by-name/gitlinker/default.nix b/plugins/by-name/gitlinker/default.nix
index 0f807e6e..01c0bf34 100644
--- a/plugins/by-name/gitlinker/default.nix
+++ b/plugins/by-name/gitlinker/default.nix
@@ -7,7 +7,7 @@
 }:
 with lib;
 {
-  options.plugins.gitlinker = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.gitlinker = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "gitlinker.nvim";
 
     package = lib.mkPackageOption pkgs "gitlinker.nvim" {
diff --git a/plugins/by-name/gitsigns/default.nix b/plugins/by-name/gitsigns/default.nix
index 18aaf00f..f8651e36 100644
--- a/plugins/by-name/gitsigns/default.nix
+++ b/plugins/by-name/gitsigns/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "gitsigns";
   packPathName = "gitsigns.nvim";
   package = "gitsigns-nvim";
diff --git a/plugins/by-name/harpoon/default.nix b/plugins/by-name/harpoon/default.nix
index 5807c02f..6d09f69c 100644
--- a/plugins/by-name/harpoon/default.nix
+++ b/plugins/by-name/harpoon/default.nix
@@ -22,7 +22,7 @@ let
   };
 in
 {
-  options.plugins.harpoon = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.harpoon = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "harpoon";
 
     package = lib.mkPackageOption pkgs "harpoon" {
diff --git a/plugins/by-name/headlines/default.nix b/plugins/by-name/headlines/default.nix
index dab2aeae..e9cf963f 100644
--- a/plugins/by-name/headlines/default.nix
+++ b/plugins/by-name/headlines/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "headlines";
   packPathName = "headlines.nvim";
   package = "headlines-nvim";
diff --git a/plugins/by-name/hop/default.nix b/plugins/by-name/hop/default.nix
index 5ae055ac..2a28424c 100644
--- a/plugins/by-name/hop/default.nix
+++ b/plugins/by-name/hop/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "hop";
   packPathName = "hop.nvim";
   package = "hop-nvim";
diff --git a/plugins/by-name/hydra/default.nix b/plugins/by-name/hydra/default.nix
index 5ea49ead..f50ae7ee 100644
--- a/plugins/by-name/hydra/default.nix
+++ b/plugins/by-name/hydra/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "hydra";
   packPathName = "hydra.nvim";
   package = "hydra-nvim";
diff --git a/plugins/by-name/idris2/default.nix b/plugins/by-name/idris2/default.nix
index 50379d14..03fd467e 100644
--- a/plugins/by-name/idris2/default.nix
+++ b/plugins/by-name/idris2/default.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "idris2";
   packPathName = "idris2";
   package = "idris2-nvim";
diff --git a/plugins/by-name/illuminate/default.nix b/plugins/by-name/illuminate/default.nix
index 93c7c008..627480d0 100644
--- a/plugins/by-name/illuminate/default.nix
+++ b/plugins/by-name/illuminate/default.nix
@@ -83,7 +83,7 @@ in
   options.plugins.illuminate =
     with helpers;
     with defaultNullOpts;
-    helpers.neovim-plugin.extraOptionsOptions
+    lib.nixvim.neovim-plugin.extraOptionsOptions
     // {
       enable = mkEnableOption "vim-illuminate";
 
diff --git a/plugins/by-name/image/default.nix b/plugins/by-name/image/default.nix
index 1d32d663..38e9a2e7 100644
--- a/plugins/by-name/image/default.nix
+++ b/plugins/by-name/image/default.nix
@@ -12,7 +12,7 @@ in
 {
   meta.maintainers = [ maintainers.GaetanLepage ];
 
-  options.plugins.image = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.image = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "image.nvim";
 
     package = lib.mkPackageOption pkgs "image.nvim" {
diff --git a/plugins/by-name/indent-blankline/default.nix b/plugins/by-name/indent-blankline/default.nix
index 45b5cb8c..03a91beb 100644
--- a/plugins/by-name/indent-blankline/default.nix
+++ b/plugins/by-name/indent-blankline/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "indent-blankline";
   packPathName = "indent-blankline.nvim";
   moduleName = "ibl";
diff --git a/plugins/by-name/jupytext/default.nix b/plugins/by-name/jupytext/default.nix
index f7c21552..901c17f9 100644
--- a/plugins/by-name/jupytext/default.nix
+++ b/plugins/by-name/jupytext/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "jupytext";
   packPathName = "jupytext.nvim";
   package = "jupytext-nvim";
diff --git a/plugins/by-name/lastplace/default.nix b/plugins/by-name/lastplace/default.nix
index b22d4f33..caf594f1 100644
--- a/plugins/by-name/lastplace/default.nix
+++ b/plugins/by-name/lastplace/default.nix
@@ -10,7 +10,7 @@ let
 in
 with lib;
 {
-  options.plugins.lastplace = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.lastplace = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lastplace";
 
     package = lib.mkPackageOption pkgs "lastplace" {
diff --git a/plugins/by-name/lean/default.nix b/plugins/by-name/lean/default.nix
index 7113418f..69c9394f 100644
--- a/plugins/by-name/lean/default.nix
+++ b/plugins/by-name/lean/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.lean;
 in
 {
-  options.plugins.lean = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.lean = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lean-nvim";
 
     package = lib.mkPackageOption pkgs "lean-nvim" {
diff --git a/plugins/by-name/leap/default.nix b/plugins/by-name/leap/default.nix
index f02b99de..46923006 100644
--- a/plugins/by-name/leap/default.nix
+++ b/plugins/by-name/leap/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.leap;
 in
 {
-  options.plugins.leap = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.leap = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "leap.nvim";
 
     package = lib.mkPackageOption pkgs "leap.nvim" {
diff --git a/plugins/by-name/lint/default.nix b/plugins/by-name/lint/default.nix
index 0da78f1a..9b266396 100644
--- a/plugins/by-name/lint/default.nix
+++ b/plugins/by-name/lint/default.nix
@@ -133,7 +133,7 @@ let
     };
 in
 {
-  options.plugins.lint = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.lint = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-lint";
 
     package = lib.mkPackageOption pkgs "nvim-lint" {
diff --git a/plugins/by-name/lsp-lines/default.nix b/plugins/by-name/lsp-lines/default.nix
index df6fd7f1..e6c5b2ab 100644
--- a/plugins/by-name/lsp-lines/default.nix
+++ b/plugins/by-name/lsp-lines/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "lsp-lines";
   moduleName = "lsp_lines";
   packPathName = "lsp_lines.nvim";
diff --git a/plugins/by-name/lspkind/default.nix b/plugins/by-name/lspkind/default.nix
index c43cada9..5212f671 100644
--- a/plugins/by-name/lspkind/default.nix
+++ b/plugins/by-name/lspkind/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.lspkind;
 in
 {
-  options.plugins.lspkind = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.lspkind = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lspkind.nvim";
 
     package = lib.mkPackageOption pkgs "lspkind" {
diff --git a/plugins/by-name/lspsaga/default.nix b/plugins/by-name/lspsaga/default.nix
index a319af73..a070eca8 100644
--- a/plugins/by-name/lspsaga/default.nix
+++ b/plugins/by-name/lspsaga/default.nix
@@ -47,7 +47,7 @@ in
       ];
 
   options = {
-    plugins.lspsaga = helpers.neovim-plugin.extraOptionsOptions // {
+    plugins.lspsaga = lib.nixvim.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "lspsaga.nvim";
 
       package = lib.mkPackageOption pkgs "lspsaga" {
diff --git a/plugins/by-name/ltex-extra/default.nix b/plugins/by-name/ltex-extra/default.nix
index 7b553050..eb3d8e50 100644
--- a/plugins/by-name/ltex-extra/default.nix
+++ b/plugins/by-name/ltex-extra/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "ltex-extra";
   packPathName = "ltex_extra.nvim";
   package = "ltex_extra-nvim";
diff --git a/plugins/by-name/mark-radar/default.nix b/plugins/by-name/mark-radar/default.nix
index 7b3417e4..8f5582f7 100644
--- a/plugins/by-name/mark-radar/default.nix
+++ b/plugins/by-name/mark-radar/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.mark-radar;
 in
 {
-  options.plugins.mark-radar = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.mark-radar = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "mark-radar";
 
     package = lib.mkPackageOption pkgs "mark-radar" {
diff --git a/plugins/by-name/marks/default.nix b/plugins/by-name/marks/default.nix
index 44f5e59a..324f7cd3 100644
--- a/plugins/by-name/marks/default.nix
+++ b/plugins/by-name/marks/default.nix
@@ -12,7 +12,7 @@ in
 {
   meta.maintainers = [ maintainers.GaetanLepage ];
 
-  options.plugins.marks = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.marks = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "marks.nvim";
 
     package = lib.mkPackageOption pkgs "marks.nvim" {
diff --git a/plugins/by-name/mkdnflow/default.nix b/plugins/by-name/mkdnflow/default.nix
index 4858573e..859902c1 100644
--- a/plugins/by-name/mkdnflow/default.nix
+++ b/plugins/by-name/mkdnflow/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.mkdnflow;
 in
 {
-  options.plugins.mkdnflow = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.mkdnflow = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "mkdnflow.nvim";
 
     package = lib.mkPackageOption pkgs "mkdnflow.nvim" {
diff --git a/plugins/by-name/multicursors/default.nix b/plugins/by-name/multicursors/default.nix
index eb0b24fb..3cd98237 100644
--- a/plugins/by-name/multicursors/default.nix
+++ b/plugins/by-name/multicursors/default.nix
@@ -45,7 +45,7 @@ let
 in
 {
   options = {
-    plugins.multicursors = helpers.neovim-plugin.extraOptionsOptions // {
+    plugins.multicursors = lib.nixvim.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "multicursors.nvim";
 
       package = lib.mkPackageOption pkgs "multicursors.nvim" {
diff --git a/plugins/by-name/navbuddy/default.nix b/plugins/by-name/navbuddy/default.nix
index 5deb7372..70b81b16 100644
--- a/plugins/by-name/navbuddy/default.nix
+++ b/plugins/by-name/navbuddy/default.nix
@@ -13,7 +13,7 @@ let
   mkPercentageOpt = default: helpers.defaultNullOpts.mkNullable percentageType (toString default);
 in
 {
-  options.plugins.navbuddy = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.navbuddy = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-navbuddy";
 
     package = lib.mkPackageOption pkgs "nvim-navbuddy" {
diff --git a/plugins/by-name/neo-tree/default.nix b/plugins/by-name/neo-tree/default.nix
index afce83a0..c9f45477 100644
--- a/plugins/by-name/neo-tree/default.nix
+++ b/plugins/by-name/neo-tree/default.nix
@@ -52,7 +52,7 @@ in
         '';
       };
     in
-    helpers.neovim-plugin.extraOptionsOptions
+    lib.nixvim.neovim-plugin.extraOptionsOptions
     // {
       enable = mkEnableOption "neo-tree";
 
diff --git a/plugins/by-name/neoclip/default.nix b/plugins/by-name/neoclip/default.nix
index a4e04adc..28a037d7 100644
--- a/plugins/by-name/neoclip/default.nix
+++ b/plugins/by-name/neoclip/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neoclip";
   packPathName = "nvim-neoclip.lua";
   package = "nvim-neoclip-lua";
diff --git a/plugins/by-name/neocord/default.nix b/plugins/by-name/neocord/default.nix
index fa0ee353..68ef1550 100644
--- a/plugins/by-name/neocord/default.nix
+++ b/plugins/by-name/neocord/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neocord";
 
   maintainers = [ ];
diff --git a/plugins/by-name/neogen/default.nix b/plugins/by-name/neogen/default.nix
index b00fdff5..6a0198f8 100644
--- a/plugins/by-name/neogen/default.nix
+++ b/plugins/by-name/neogen/default.nix
@@ -44,7 +44,7 @@ let
   };
 in
 {
-  options.plugins.neogen = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.neogen = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "neogen";
 
     package = lib.mkPackageOption pkgs "neogen" {
diff --git a/plugins/by-name/neogit/default.nix b/plugins/by-name/neogit/default.nix
index 38581023..9b7b4e8b 100644
--- a/plugins/by-name/neogit/default.nix
+++ b/plugins/by-name/neogit/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neogit";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/by-name/neoscroll/default.nix b/plugins/by-name/neoscroll/default.nix
index 2e6e4b7a..141467d0 100644
--- a/plugins/by-name/neoscroll/default.nix
+++ b/plugins/by-name/neoscroll/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neoscroll";
   packPathName = "neoscroll.nvim";
   package = "neoscroll-nvim";
diff --git a/plugins/by-name/nix-develop/default.nix b/plugins/by-name/nix-develop/default.nix
index 2534faf5..2adb022c 100644
--- a/plugins/by-name/nix-develop/default.nix
+++ b/plugins/by-name/nix-develop/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.nix-develop;
 in
 {
-  options.plugins.nix-develop = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.nix-develop = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nix-develop.nvim";
 
     package = lib.mkPackageOption pkgs "nix-develop.nvim" {
diff --git a/plugins/by-name/notify/default.nix b/plugins/by-name/notify/default.nix
index 450965fd..6b9dd6d9 100644
--- a/plugins/by-name/notify/default.nix
+++ b/plugins/by-name/notify/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.notify;
 in
 {
-  options.plugins.notify = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.notify = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-notify";
 
     package = lib.mkPackageOption pkgs "nvim-notify" {
diff --git a/plugins/by-name/nvim-autopairs/default.nix b/plugins/by-name/nvim-autopairs/default.nix
index e72bafb8..bf93916c 100644
--- a/plugins/by-name/nvim-autopairs/default.nix
+++ b/plugins/by-name/nvim-autopairs/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "nvim-autopairs";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/by-name/nvim-bqf/default.nix b/plugins/by-name/nvim-bqf/default.nix
index 993943f1..2e0a0bc2 100644
--- a/plugins/by-name/nvim-bqf/default.nix
+++ b/plugins/by-name/nvim-bqf/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.nvim-bqf;
 in
 {
-  options.plugins.nvim-bqf = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.nvim-bqf = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-bqf";
 
     package = lib.mkPackageOption pkgs "nvim-bqf" {
diff --git a/plugins/by-name/nvim-jdtls/default.nix b/plugins/by-name/nvim-jdtls/default.nix
index 98a2331d..641828d3 100644
--- a/plugins/by-name/nvim-jdtls/default.nix
+++ b/plugins/by-name/nvim-jdtls/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.plugins.nvim-jdtls;
 in
 {
-  options.plugins.nvim-jdtls = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.nvim-jdtls = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-jdtls";
 
     package = lib.mkPackageOption pkgs "nvim-jdtls" {
diff --git a/plugins/by-name/nvim-lightbulb/default.nix b/plugins/by-name/nvim-lightbulb/default.nix
index a3672bb3..607dc13f 100644
--- a/plugins/by-name/nvim-lightbulb/default.nix
+++ b/plugins/by-name/nvim-lightbulb/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "nvim-lightbulb";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/by-name/nvim-tree/default.nix b/plugins/by-name/nvim-tree/default.nix
index a4475b7f..8dc3f01e 100644
--- a/plugins/by-name/nvim-tree/default.nix
+++ b/plugins/by-name/nvim-tree/default.nix
@@ -36,7 +36,7 @@ in
       "hideRootFolder"
     ] "Set `plugins.nvim-tree.renderer.rootFolderLabel` to `false` to hide the root folder.")
   ];
-  options.plugins.nvim-tree = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.nvim-tree = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-tree";
 
     package = lib.mkPackageOption pkgs "nvim-tree" {
diff --git a/plugins/by-name/obsidian/default.nix b/plugins/by-name/obsidian/default.nix
index ba33d6eb..aca8312e 100644
--- a/plugins/by-name/obsidian/default.nix
+++ b/plugins/by-name/obsidian/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "obsidian";
   packPathName = "obsidian.nvim";
   package = "obsidian-nvim";
diff --git a/plugins/by-name/oil/default.nix b/plugins/by-name/oil/default.nix
index 623e6f4e..2e1b72c4 100644
--- a/plugins/by-name/oil/default.nix
+++ b/plugins/by-name/oil/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "oil";
   packPathName = "oil.nvim";
   package = "oil-nvim";
diff --git a/plugins/by-name/ollama/default.nix b/plugins/by-name/ollama/default.nix
index 4accdb47..a4e8b495 100644
--- a/plugins/by-name/ollama/default.nix
+++ b/plugins/by-name/ollama/default.nix
@@ -60,7 +60,7 @@ in
 {
   meta.maintainers = [ maintainers.GaetanLepage ];
 
-  options.plugins.ollama = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.ollama = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "ollama.nvim";
 
     package = lib.mkPackageOption pkgs "ollama.nvim" {
diff --git a/plugins/by-name/otter/default.nix b/plugins/by-name/otter/default.nix
index 203145fc..173812e2 100644
--- a/plugins/by-name/otter/default.nix
+++ b/plugins/by-name/otter/default.nix
@@ -4,7 +4,7 @@
   config,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "otter";
   packPathName = "otter.nvim";
   package = "otter-nvim";
diff --git a/plugins/by-name/persistence/default.nix b/plugins/by-name/persistence/default.nix
index 90a5aecb..fb426c15 100644
--- a/plugins/by-name/persistence/default.nix
+++ b/plugins/by-name/persistence/default.nix
@@ -7,7 +7,7 @@
 }:
 with lib;
 {
-  options.plugins.persistence = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.persistence = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "persistence.nvim";
 
     package = lib.mkPackageOption pkgs "persistence.nvim" {
diff --git a/plugins/by-name/presence-nvim/default.nix b/plugins/by-name/presence-nvim/default.nix
index 09d6b657..02285c3b 100644
--- a/plugins/by-name/presence-nvim/default.nix
+++ b/plugins/by-name/presence-nvim/default.nix
@@ -11,7 +11,7 @@ let
 in
 {
   options = {
-    plugins.presence-nvim = helpers.neovim-plugin.extraOptionsOptions // {
+    plugins.presence-nvim = lib.nixvim.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "presence-nvim";
       package = lib.mkPackageOption pkgs "presence-nvim" {
         default = [
diff --git a/plugins/by-name/preview/default.nix b/plugins/by-name/preview/default.nix
index 3f3aec8a..e239752a 100644
--- a/plugins/by-name/preview/default.nix
+++ b/plugins/by-name/preview/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "preview";
   packPathName = "Preview.nvim";
   package = "Preview-nvim";
diff --git a/plugins/by-name/qmk/default.nix b/plugins/by-name/qmk/default.nix
index cb527973..08c5317a 100644
--- a/plugins/by-name/qmk/default.nix
+++ b/plugins/by-name/qmk/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "qmk";
   packPathName = "qmk.nvim";
   package = "qmk-nvim";
diff --git a/plugins/by-name/rainbow-delimiters/default.nix b/plugins/by-name/rainbow-delimiters/default.nix
index 1d6b5e7f..1586e314 100644
--- a/plugins/by-name/rainbow-delimiters/default.nix
+++ b/plugins/by-name/rainbow-delimiters/default.nix
@@ -7,7 +7,7 @@
 }:
 with lib;
 {
-  options.plugins.rainbow-delimiters = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.rainbow-delimiters = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rainbow-delimiters.nvim";
 
     package = lib.mkPackageOption pkgs "rainbow-delimiters.nvim" {
diff --git a/plugins/by-name/refactoring/default.nix b/plugins/by-name/refactoring/default.nix
index 4daab63e..92224395 100644
--- a/plugins/by-name/refactoring/default.nix
+++ b/plugins/by-name/refactoring/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "refactoring";
   packPathName = "refactoring.nvim";
   package = "refactoring-nvim";
diff --git a/plugins/by-name/rustaceanvim/default.nix b/plugins/by-name/rustaceanvim/default.nix
index 70e0ff82..1f2b5ea1 100644
--- a/plugins/by-name/rustaceanvim/default.nix
+++ b/plugins/by-name/rustaceanvim/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "rustaceanvim";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/by-name/smart-splits/default.nix b/plugins/by-name/smart-splits/default.nix
index a22b70ef..8c641495 100644
--- a/plugins/by-name/smart-splits/default.nix
+++ b/plugins/by-name/smart-splits/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "smart-splits";
   packPathName = "smart-splits.nvim";
   package = "smart-splits-nvim";
diff --git a/plugins/by-name/sniprun/default.nix b/plugins/by-name/sniprun/default.nix
index e3b4f248..88b965c5 100644
--- a/plugins/by-name/sniprun/default.nix
+++ b/plugins/by-name/sniprun/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "sniprun";
   url = "https://github.com/michaelb/sniprun";
 
diff --git a/plugins/by-name/specs/default.nix b/plugins/by-name/specs/default.nix
index ac0680e6..14fca7e0 100644
--- a/plugins/by-name/specs/default.nix
+++ b/plugins/by-name/specs/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "specs";
   packPathName = "specs.nvim";
   package = "specs-nvim";
diff --git a/plugins/by-name/spectre/default.nix b/plugins/by-name/spectre/default.nix
index 57cf933c..8ad38107 100644
--- a/plugins/by-name/spectre/default.nix
+++ b/plugins/by-name/spectre/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "spectre";
   packPathName = "nvim-spectre";
   package = "nvim-spectre";
diff --git a/plugins/by-name/spider/default.nix b/plugins/by-name/spider/default.nix
index 36bdae6a..5867f144 100644
--- a/plugins/by-name/spider/default.nix
+++ b/plugins/by-name/spider/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.plugins.${pluginName};
 in
 {
-  options.plugins.${pluginName} = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.${pluginName} = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption pluginName;
 
     package = lib.mkPackageOption pkgs pluginName {
diff --git a/plugins/by-name/startup/default.nix b/plugins/by-name/startup/default.nix
index 33049234..68935d4c 100644
--- a/plugins/by-name/startup/default.nix
+++ b/plugins/by-name/startup/default.nix
@@ -12,7 +12,7 @@ in
 {
   meta.maintainers = [ maintainers.GaetanLepage ];
 
-  options.plugins.startup = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.startup = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "startup.nvim";
 
     package = lib.mkPackageOption pkgs "startup.nvim" {
diff --git a/plugins/by-name/statuscol/default.nix b/plugins/by-name/statuscol/default.nix
index ed363834..6b982c00 100644
--- a/plugins/by-name/statuscol/default.nix
+++ b/plugins/by-name/statuscol/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "statuscol";
   packPathName = "statuscol.nvim";
   package = "statuscol-nvim";
diff --git a/plugins/by-name/toggleterm/default.nix b/plugins/by-name/toggleterm/default.nix
index bbe2a2eb..a36d449f 100644
--- a/plugins/by-name/toggleterm/default.nix
+++ b/plugins/by-name/toggleterm/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "toggleterm";
   packPathName = "toggleterm.nvim";
   package = "toggleterm-nvim";
diff --git a/plugins/by-name/transparent/default.nix b/plugins/by-name/transparent/default.nix
index c34cc557..5262c29b 100644
--- a/plugins/by-name/transparent/default.nix
+++ b/plugins/by-name/transparent/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "transparent";
   packPathName = "transparent.nvim";
   package = "transparent-nvim";
diff --git a/plugins/by-name/treesitter-context/default.nix b/plugins/by-name/treesitter-context/default.nix
index 5c6fa9d6..b2b74f4f 100644
--- a/plugins/by-name/treesitter-context/default.nix
+++ b/plugins/by-name/treesitter-context/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "treesitter-context";
   packPathName = "nvim-treesitter-context";
   package = "nvim-treesitter-context";
diff --git a/plugins/by-name/treesitter-textobjects/default.nix b/plugins/by-name/treesitter-textobjects/default.nix
index a9b8e8db..ee6cc5c2 100644
--- a/plugins/by-name/treesitter-textobjects/default.nix
+++ b/plugins/by-name/treesitter-textobjects/default.nix
@@ -37,7 +37,7 @@ with lib;
           })
         ) { } desc;
     in
-    helpers.neovim-plugin.extraOptionsOptions
+    lib.nixvim.neovim-plugin.extraOptionsOptions
     // {
       enable = mkEnableOption "treesitter-textobjects (requires plugins.treesitter.enable to be true)";
 
diff --git a/plugins/by-name/treesitter/default.nix b/plugins/by-name/treesitter/default.nix
index b745ddfc..d2cc76c6 100644
--- a/plugins/by-name/treesitter/default.nix
+++ b/plugins/by-name/treesitter/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "treesitter";
   packPathName = "nvim-treesitter";
   moduleName = "nvim-treesitter.configs";
diff --git a/plugins/by-name/trim/default.nix b/plugins/by-name/trim/default.nix
index a212f252..2cc2322f 100644
--- a/plugins/by-name/trim/default.nix
+++ b/plugins/by-name/trim/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "trim";
   packPathName = "trim.nvim";
   package = "trim-nvim";
diff --git a/plugins/by-name/ts-autotag/default.nix b/plugins/by-name/ts-autotag/default.nix
index d1de13d0..4575ee30 100644
--- a/plugins/by-name/ts-autotag/default.nix
+++ b/plugins/by-name/ts-autotag/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "ts-autotag";
   packPathName = "nvim-ts-autotag";
   moduleName = "nvim-ts-autotag";
diff --git a/plugins/by-name/ts-context-commentstring/default.nix b/plugins/by-name/ts-context-commentstring/default.nix
index 43b74f6b..7f0cdd6d 100644
--- a/plugins/by-name/ts-context-commentstring/default.nix
+++ b/plugins/by-name/ts-context-commentstring/default.nix
@@ -7,7 +7,7 @@
 }:
 with lib;
 {
-  options.plugins.ts-context-commentstring = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.ts-context-commentstring = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-ts-context-commentstring";
 
     package = lib.mkPackageOption pkgs "ts-context-commentstring" {
diff --git a/plugins/by-name/twilight/default.nix b/plugins/by-name/twilight/default.nix
index e33eb68b..f87bef86 100644
--- a/plugins/by-name/twilight/default.nix
+++ b/plugins/by-name/twilight/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "twilight";
   packPathName = "twilight.nvim";
   package = "twilight-nvim";
diff --git a/plugins/by-name/wilder/default.nix b/plugins/by-name/wilder/default.nix
index 5e9087fa..d245b38f 100644
--- a/plugins/by-name/wilder/default.nix
+++ b/plugins/by-name/wilder/default.nix
@@ -63,7 +63,7 @@ in
     )
   ];
 
-  options.plugins.wilder = helpers.neovim-plugin.extraOptionsOptions // {
+  options.plugins.wilder = lib.nixvim.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "wilder-nvim";
 
     package = lib.mkPackageOption pkgs "wilder-nvim" {
diff --git a/plugins/by-name/wtf/default.nix b/plugins/by-name/wtf/default.nix
index 3a638771..585d588e 100644
--- a/plugins/by-name/wtf/default.nix
+++ b/plugins/by-name/wtf/default.nix
@@ -40,7 +40,7 @@ let
 in
 {
   options = {
-    plugins.wtf = helpers.neovim-plugin.extraOptionsOptions // {
+    plugins.wtf = lib.nixvim.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "wtf.nvim";
 
       package = lib.mkPackageOption pkgs "wtf.nvim" {
diff --git a/plugins/by-name/yanky/default.nix b/plugins/by-name/yanky/default.nix
index 27297ae9..4a5eacbf 100644
--- a/plugins/by-name/yanky/default.nix
+++ b/plugins/by-name/yanky/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "yanky";
   packPathName = "yanky.nvim";
   package = "yanky-nvim";
diff --git a/plugins/by-name/zellij/default.nix b/plugins/by-name/zellij/default.nix
index 5c85e359..892e2e52 100644
--- a/plugins/by-name/zellij/default.nix
+++ b/plugins/by-name/zellij/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "zellij";
   packPathName = "zellij.nvim";
   package = "zellij-nvim";
diff --git a/plugins/by-name/zen-mode/default.nix b/plugins/by-name/zen-mode/default.nix
index 0af63178..2a7ca79a 100644
--- a/plugins/by-name/zen-mode/default.nix
+++ b/plugins/by-name/zen-mode/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "zen-mode";
   packPathName = "zen-mode.nvim";
   package = "zen-mode-nvim";
diff --git a/plugins/by-name/zk/default.nix b/plugins/by-name/zk/default.nix
index f1d91966..aafafb7b 100644
--- a/plugins/by-name/zk/default.nix
+++ b/plugins/by-name/zk/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "zk";
   packPathName = "zk.nvim";
   package = "zk-nvim";