diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b5e281ec..e0cc2e1d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,7 +41,7 @@ To add a new plugin you need to do the following.
 2. The vast majority of plugins fall into one of those two categories:
 
 - _vim plugins_: They are configured through **global variables** (`g:plugin_foo_option` in vimscript and `vim.g.plugin_foo_option` in lua).\
-  For those, you should use the `lib.nixvim.vim-plugin.mkVimPlugin`.\
+  For those, you should use the `lib.nixvim.plugins.mkVimPlugin`.\
   -> See [this plugin](plugins/utils/direnv.nix) for an example.
 - _neovim plugins_: They are configured through a `setup` function (`require('plugin').setup({opts})`).\
   For those, you should use the `lib.nixvim.plugins.mkNeovimPlugin`.\
diff --git a/plugins/by-name/airline/default.nix b/plugins/by-name/airline/default.nix
index 78bfaca4..5c460dd7 100644
--- a/plugins/by-name/airline/default.nix
+++ b/plugins/by-name/airline/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "airline";
   packPathName = "vim-airline";
   package = "vim-airline";
diff --git a/plugins/by-name/autosource/default.nix b/plugins/by-name/autosource/default.nix
index b0fc3147..f54a271b 100644
--- a/plugins/by-name/autosource/default.nix
+++ b/plugins/by-name/autosource/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "autosource";
   packPathName = "vim-autosource";
   package = "vim-autosource";
diff --git a/plugins/by-name/bufdelete/default.nix b/plugins/by-name/bufdelete/default.nix
index 252f8d3a..10f8d0a2 100644
--- a/plugins/by-name/bufdelete/default.nix
+++ b/plugins/by-name/bufdelete/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "bufdelete";
   packPathName = "bufdelete.nvim";
   package = "bufdelete-nvim";
diff --git a/plugins/by-name/codeium-vim/default.nix b/plugins/by-name/codeium-vim/default.nix
index 41d1dd3e..3b81952f 100644
--- a/plugins/by-name/codeium-vim/default.nix
+++ b/plugins/by-name/codeium-vim/default.nix
@@ -34,7 +34,7 @@ let
     };
   };
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "codeium-vim";
   packPathName = "codeium.vim";
   globalPrefix = "codeium_";
diff --git a/plugins/by-name/commentary/default.nix b/plugins/by-name/commentary/default.nix
index ead3134d..c80428c5 100644
--- a/plugins/by-name/commentary/default.nix
+++ b/plugins/by-name/commentary/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "commentary";
   packPathName = "vim-commentary";
   package = "vim-commentary";
diff --git a/plugins/by-name/committia/default.nix b/plugins/by-name/committia/default.nix
index 565ff8ef..25aaad45 100644
--- a/plugins/by-name/committia/default.nix
+++ b/plugins/by-name/committia/default.nix
@@ -6,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "committia";
   packPathName = "committia.vim";
   package = "committia-vim";
diff --git a/plugins/by-name/conjure/default.nix b/plugins/by-name/conjure/default.nix
index 37611ae5..88fb8a4f 100644
--- a/plugins/by-name/conjure/default.nix
+++ b/plugins/by-name/conjure/default.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "conjure";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/by-name/copilot-vim/default.nix b/plugins/by-name/copilot-vim/default.nix
index c3c829a8..c02cb54c 100644
--- a/plugins/by-name/copilot-vim/default.nix
+++ b/plugins/by-name/copilot-vim/default.nix
@@ -5,8 +5,8 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
-lib.nixvim.vim-plugin.mkVimPlugin {
+with lib.nixvim.plugins;
+lib.nixvim.plugins.mkVimPlugin {
   name = "copilot-vim";
   packPathName = "copilot.vim";
   globalPrefix = "copilot_";
diff --git a/plugins/by-name/direnv/default.nix b/plugins/by-name/direnv/default.nix
index 2ac9c53a..40cfe09c 100644
--- a/plugins/by-name/direnv/default.nix
+++ b/plugins/by-name/direnv/default.nix
@@ -6,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "direnv";
   packPathName = "direnv.vim";
   package = "direnv-vim";
diff --git a/plugins/by-name/earthly/default.nix b/plugins/by-name/earthly/default.nix
index cfb79a9a..9cc77d35 100644
--- a/plugins/by-name/earthly/default.nix
+++ b/plugins/by-name/earthly/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "earthly";
   packPathName = "earthly.vim";
   package = "earthly-vim";
diff --git a/plugins/by-name/easyescape/default.nix b/plugins/by-name/easyescape/default.nix
index 599c8e07..0f2b83f4 100644
--- a/plugins/by-name/easyescape/default.nix
+++ b/plugins/by-name/easyescape/default.nix
@@ -6,7 +6,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "easyescape";
   packPathName = "vim-easyescape";
   package = "vim-easyescape";
diff --git a/plugins/by-name/emmet/default.nix b/plugins/by-name/emmet/default.nix
index 74d9424c..e13e4dde 100644
--- a/plugins/by-name/emmet/default.nix
+++ b/plugins/by-name/emmet/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "emmet";
   packPathName = "emmet-vim";
diff --git a/plugins/by-name/endwise/default.nix b/plugins/by-name/endwise/default.nix
index 8ebee451..c4982387 100644
--- a/plugins/by-name/endwise/default.nix
+++ b/plugins/by-name/endwise/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "endwise";
   packPathName = "vim-endwise";
   package = "vim-endwise";
diff --git a/plugins/by-name/floaterm/default.nix b/plugins/by-name/floaterm/default.nix
index 63fadd3c..5b6cbd9d 100644
--- a/plugins/by-name/floaterm/default.nix
+++ b/plugins/by-name/floaterm/default.nix
@@ -6,7 +6,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrStr;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "floaterm";
   packPathName = "vim-floaterm";
   package = "vim-floaterm";
diff --git a/plugins/by-name/friendly-snippets/default.nix b/plugins/by-name/friendly-snippets/default.nix
index d4f8b4de..371f2588 100644
--- a/plugins/by-name/friendly-snippets/default.nix
+++ b/plugins/by-name/friendly-snippets/default.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "friendly-snippets";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/by-name/fugitive/default.nix b/plugins/by-name/fugitive/default.nix
index d2397237..8bdc60d1 100644
--- a/plugins/by-name/fugitive/default.nix
+++ b/plugins/by-name/fugitive/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "fugitive";
   packPathName = "vim-fugitive";
   package = "vim-fugitive";
diff --git a/plugins/by-name/gitgutter/default.nix b/plugins/by-name/gitgutter/default.nix
index 901b3172..d5c2397c 100644
--- a/plugins/by-name/gitgutter/default.nix
+++ b/plugins/by-name/gitgutter/default.nix
@@ -7,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "gitgutter";
   packPathName = "vim-gitgutter";
   package = "vim-gitgutter";
diff --git a/plugins/by-name/gitignore/default.nix b/plugins/by-name/gitignore/default.nix
index fea652de..ff1664c5 100644
--- a/plugins/by-name/gitignore/default.nix
+++ b/plugins/by-name/gitignore/default.nix
@@ -6,7 +6,7 @@
 with lib;
 # We use `mkVimPlugin` to avoid having a `settings` option.
 # Indeed, this plugin is not configurable in the common sense (no `setup` function).
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "gitignore";
   packPathName = "gitignore.nvim";
   package = "gitignore-nvim";
diff --git a/plugins/by-name/gitmessenger/default.nix b/plugins/by-name/gitmessenger/default.nix
index a86f1840..d0793bf4 100644
--- a/plugins/by-name/gitmessenger/default.nix
+++ b/plugins/by-name/gitmessenger/default.nix
@@ -7,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "gitmessenger";
   packPathName = "git-messenger.vim";
   package = "git-messenger-vim";
diff --git a/plugins/by-name/godot/default.nix b/plugins/by-name/godot/default.nix
index 70dff75e..8f4f7f14 100644
--- a/plugins/by-name/godot/default.nix
+++ b/plugins/by-name/godot/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "godot";
   packPathName = "vim-godot";
   package = "vim-godot";
diff --git a/plugins/by-name/goyo/default.nix b/plugins/by-name/goyo/default.nix
index 2c272ea9..0138970e 100644
--- a/plugins/by-name/goyo/default.nix
+++ b/plugins/by-name/goyo/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 with lib;
 mkVimPlugin {
   name = "goyo";
diff --git a/plugins/by-name/haskell-scope-highlighting/default.nix b/plugins/by-name/haskell-scope-highlighting/default.nix
index ea3a6a72..f5f47476 100644
--- a/plugins/by-name/haskell-scope-highlighting/default.nix
+++ b/plugins/by-name/haskell-scope-highlighting/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "haskell-scope-highlighting";
   packPathName = "haskell-scope-highlighting.nvim";
   package = "haskell-scope-highlighting-nvim";
diff --git a/plugins/by-name/helm/default.nix b/plugins/by-name/helm/default.nix
index b464b24c..f98e44f7 100644
--- a/plugins/by-name/helm/default.nix
+++ b/plugins/by-name/helm/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "helm";
   packPathName = "vim-helm";
   package = "vim-helm";
diff --git a/plugins/by-name/improved-search/default.nix b/plugins/by-name/improved-search/default.nix
index 425ba6c1..070fc5e2 100644
--- a/plugins/by-name/improved-search/default.nix
+++ b/plugins/by-name/improved-search/default.nix
@@ -6,7 +6,7 @@
 with lib;
 # This plugin is only configured through keymaps, so we use `mkVimPlugin` without the
 # `globalPrefix` argument to avoid the creation of the `settings` option.
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "improved-search";
   packPathName = "improved-search.nvim";
   package = "improved-search-nvim";
diff --git a/plugins/by-name/instant/default.nix b/plugins/by-name/instant/default.nix
index 508e6821..ebb8f586 100644
--- a/plugins/by-name/instant/default.nix
+++ b/plugins/by-name/instant/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "instant";
   packPathName = "instant.nvim";
diff --git a/plugins/by-name/intellitab/default.nix b/plugins/by-name/intellitab/default.nix
index 6e624f8b..359641ca 100644
--- a/plugins/by-name/intellitab/default.nix
+++ b/plugins/by-name/intellitab/default.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "intellitab";
   packPathName = "intellitab.nvim";
   package = "intellitab-nvim";
diff --git a/plugins/by-name/julia-cell/default.nix b/plugins/by-name/julia-cell/default.nix
index c0ea2441..021344fb 100644
--- a/plugins/by-name/julia-cell/default.nix
+++ b/plugins/by-name/julia-cell/default.nix
@@ -35,7 +35,7 @@ let
   };
 in
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "julia-cell";
   packPathName = "vim-julia-cell";
   package = "vim-julia-cell";
diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix
index 81547ab5..2f656f91 100644
--- a/plugins/by-name/lazygit/default.nix
+++ b/plugins/by-name/lazygit/default.nix
@@ -7,7 +7,7 @@ let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "lazygit";
   packPathName = "lazygit.nvim";
   package = "lazygit-nvim";
diff --git a/plugins/by-name/ledger/default.nix b/plugins/by-name/ledger/default.nix
index e88cd064..bb984ed4 100644
--- a/plugins/by-name/ledger/default.nix
+++ b/plugins/by-name/ledger/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "ledger";
   packPathName = "vim-ledger";
diff --git a/plugins/by-name/magma-nvim/default.nix b/plugins/by-name/magma-nvim/default.nix
index 2151c36e..c9525a15 100644
--- a/plugins/by-name/magma-nvim/default.nix
+++ b/plugins/by-name/magma-nvim/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "magma-nvim";
   packPathName = "magma-nvim";
diff --git a/plugins/by-name/markdown-preview/default.nix b/plugins/by-name/markdown-preview/default.nix
index e9cd6b60..3e271e4a 100644
--- a/plugins/by-name/markdown-preview/default.nix
+++ b/plugins/by-name/markdown-preview/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "markdown-preview";
   packPathName = "markdown-preview.nvim";
diff --git a/plugins/by-name/molten/default.nix b/plugins/by-name/molten/default.nix
index 63421dfb..d4c34dac 100644
--- a/plugins/by-name/molten/default.nix
+++ b/plugins/by-name/molten/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "molten";
   packPathName = "molten-nvim";
diff --git a/plugins/by-name/nabla/default.nix b/plugins/by-name/nabla/default.nix
index 9576cd0b..f0d21dcd 100644
--- a/plugins/by-name/nabla/default.nix
+++ b/plugins/by-name/nabla/default.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "nabla";
   packPathName = "nabla.nvim";
   package = "nabla-nvim";
diff --git a/plugins/by-name/nix/default.nix b/plugins/by-name/nix/default.nix
index 7e83e6aa..cdd3e0da 100644
--- a/plugins/by-name/nix/default.nix
+++ b/plugins/by-name/nix/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "nix";
   packPathName = "vim-nix";
   package = "vim-nix";
diff --git a/plugins/by-name/numbertoggle/default.nix b/plugins/by-name/numbertoggle/default.nix
index 0cc5d4a2..ee7058b1 100644
--- a/plugins/by-name/numbertoggle/default.nix
+++ b/plugins/by-name/numbertoggle/default.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "numbertoggle";
   packPathName = "vim-numbertoggle";
   package = "vim-numbertoggle";
diff --git a/plugins/by-name/openscad/default.nix b/plugins/by-name/openscad/default.nix
index 6d3b9a32..e08131ad 100644
--- a/plugins/by-name/openscad/default.nix
+++ b/plugins/by-name/openscad/default.nix
@@ -7,7 +7,7 @@
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts applyPrefixToAttrs;
-  inherit (lib.nixvim.vim-plugin) mkSettingsOptionDescription;
+  inherit (lib.nixvim.plugins.vim) mkSettingsOptionDescription;
 
   name = "openscad";
   globalPrefix = "openscad_";
diff --git a/plugins/by-name/parinfer-rust/default.nix b/plugins/by-name/parinfer-rust/default.nix
index 187af015..32516e0d 100644
--- a/plugins/by-name/parinfer-rust/default.nix
+++ b/plugins/by-name/parinfer-rust/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "parinfer-rust";
   globalPrefix = "parinfer_";
 
diff --git a/plugins/by-name/plantuml-syntax/default.nix b/plugins/by-name/plantuml-syntax/default.nix
index 36363332..1e1871b0 100644
--- a/plugins/by-name/plantuml-syntax/default.nix
+++ b/plugins/by-name/plantuml-syntax/default.nix
@@ -6,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "plantuml-syntax";
   globalPrefix = "plantuml_";
 
diff --git a/plugins/by-name/quickmath/default.nix b/plugins/by-name/quickmath/default.nix
index 2dbb0f99..a45e4077 100644
--- a/plugins/by-name/quickmath/default.nix
+++ b/plugins/by-name/quickmath/default.nix
@@ -5,7 +5,7 @@
 let
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "quickmath";
   packPathName = "quickmath.nvim";
   package = "quickmath-nvim";
diff --git a/plugins/by-name/repeat/default.nix b/plugins/by-name/repeat/default.nix
index 33991015..3f1445cf 100644
--- a/plugins/by-name/repeat/default.nix
+++ b/plugins/by-name/repeat/default.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "repeat";
   packPathName = "vim-repeat";
   package = "vim-repeat";
diff --git a/plugins/by-name/sandwich/default.nix b/plugins/by-name/sandwich/default.nix
index e4fb3318..311797c5 100644
--- a/plugins/by-name/sandwich/default.nix
+++ b/plugins/by-name/sandwich/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "sandwich";
   packPathName = "vim-sandwich";
   package = "vim-sandwich";
diff --git a/plugins/by-name/schemastore/default.nix b/plugins/by-name/schemastore/default.nix
index 1e8ad28f..d2834430 100644
--- a/plugins/by-name/schemastore/default.nix
+++ b/plugins/by-name/schemastore/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "schemastore";
   packPathName = "SchemaStore.nvim";
   package = "SchemaStore-nvim";
diff --git a/plugins/by-name/scrollview/default.nix b/plugins/by-name/scrollview/default.nix
index 0404291d..28b4bce5 100644
--- a/plugins/by-name/scrollview/default.nix
+++ b/plugins/by-name/scrollview/default.nix
@@ -3,7 +3,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrStr mkNullOrOption;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "scrollview";
   packPathName = "nvim-scrollview";
   package = "nvim-scrollview";
diff --git a/plugins/by-name/sleuth/default.nix b/plugins/by-name/sleuth/default.nix
index c7866f74..d584e98b 100644
--- a/plugins/by-name/sleuth/default.nix
+++ b/plugins/by-name/sleuth/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "sleuth";
   packPathName = "vim-sleuth";
   package = "vim-sleuth";
diff --git a/plugins/by-name/startify/default.nix b/plugins/by-name/startify/default.nix
index 72f5f930..ead43fd6 100644
--- a/plugins/by-name/startify/default.nix
+++ b/plugins/by-name/startify/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "startify";
   packPathName = "vim-startify";
diff --git a/plugins/by-name/tagbar/default.nix b/plugins/by-name/tagbar/default.nix
index a4993210..501136e4 100644
--- a/plugins/by-name/tagbar/default.nix
+++ b/plugins/by-name/tagbar/default.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "tagbar";
   globalPrefix = "tagbar_";
 
diff --git a/plugins/by-name/texpresso/default.nix b/plugins/by-name/texpresso/default.nix
index 6719abda..1ee79154 100644
--- a/plugins/by-name/texpresso/default.nix
+++ b/plugins/by-name/texpresso/default.nix
@@ -7,7 +7,7 @@
 with lib;
 # This plugin has no configuration, so we use `mkVimPlugin` without the `globalPrefix` argument to
 # avoid the creation of the `settings` option.
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "texpresso";
   packPathName = "texpresso.vim";
   package = "texpresso-vim";
diff --git a/plugins/by-name/tmux-navigator/default.nix b/plugins/by-name/tmux-navigator/default.nix
index b25b32ba..9c73d255 100644
--- a/plugins/by-name/tmux-navigator/default.nix
+++ b/plugins/by-name/tmux-navigator/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "tmux-navigator";
   packPathName = "vim-tmux-navigator";
   package = "vim-tmux-navigator";
diff --git a/plugins/by-name/typst-vim/default.nix b/plugins/by-name/typst-vim/default.nix
index 604d57c1..928949a4 100644
--- a/plugins/by-name/typst-vim/default.nix
+++ b/plugins/by-name/typst-vim/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "typst-vim";
   packPathName = "typst.vim";
   globalPrefix = "typst_";
diff --git a/plugins/by-name/undotree/default.nix b/plugins/by-name/undotree/default.nix
index 178a53f2..5553451f 100644
--- a/plugins/by-name/undotree/default.nix
+++ b/plugins/by-name/undotree/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "undotree";
   globalPrefix = "undotree_";
diff --git a/plugins/by-name/vim-bbye/default.nix b/plugins/by-name/vim-bbye/default.nix
index 67268ade..89803bb9 100644
--- a/plugins/by-name/vim-bbye/default.nix
+++ b/plugins/by-name/vim-bbye/default.nix
@@ -6,7 +6,7 @@ let
   inherit (lib.nixvim) mkNullOrOption;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-bbye";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/by-name/vim-colemak/default.nix b/plugins/by-name/vim-colemak/default.nix
index 76ce87b6..e0e4489a 100644
--- a/plugins/by-name/vim-colemak/default.nix
+++ b/plugins/by-name/vim-colemak/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-colemak";
   maintainers = [ lib.maintainers.kalbasit ];
 }
diff --git a/plugins/by-name/vim-css-color/default.nix b/plugins/by-name/vim-css-color/default.nix
index d6d8e2f7..b5bfd719 100644
--- a/plugins/by-name/vim-css-color/default.nix
+++ b/plugins/by-name/vim-css-color/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-css-color";
   maintainers = [ lib.maintainers.DanielLaing ];
 }
diff --git a/plugins/by-name/vim-dadbod-completion/default.nix b/plugins/by-name/vim-dadbod-completion/default.nix
index 8498b5b0..ca4d249d 100644
--- a/plugins/by-name/vim-dadbod-completion/default.nix
+++ b/plugins/by-name/vim-dadbod-completion/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-dadbod-completion";
   maintainers = [ lib.maintainers.BoneyPatel ];
   imports = [
diff --git a/plugins/by-name/vim-dadbod-ui/default.nix b/plugins/by-name/vim-dadbod-ui/default.nix
index 387b744d..6e3da4ac 100644
--- a/plugins/by-name/vim-dadbod-ui/default.nix
+++ b/plugins/by-name/vim-dadbod-ui/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-dadbod-ui";
   maintainers = [ lib.maintainers.BoneyPatel ];
 }
diff --git a/plugins/by-name/vim-dadbod/default.nix b/plugins/by-name/vim-dadbod/default.nix
index a6a9715e..862fc390 100644
--- a/plugins/by-name/vim-dadbod/default.nix
+++ b/plugins/by-name/vim-dadbod/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-dadbod";
   maintainers = [ lib.maintainers.BoneyPatel ];
 }
diff --git a/plugins/by-name/vim-matchup/default.nix b/plugins/by-name/vim-matchup/default.nix
index 7cc6bca6..7f9f255f 100644
--- a/plugins/by-name/vim-matchup/default.nix
+++ b/plugins/by-name/vim-matchup/default.nix
@@ -7,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrStr';
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-matchup";
   globalPrefix = "matchup_";
 
diff --git a/plugins/by-name/vim-slime/default.nix b/plugins/by-name/vim-slime/default.nix
index 4f3de0b1..6bf1ec17 100644
--- a/plugins/by-name/vim-slime/default.nix
+++ b/plugins/by-name/vim-slime/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "vim-slime";
   globalPrefix = "slime_";
diff --git a/plugins/by-name/vim-suda/default.nix b/plugins/by-name/vim-suda/default.nix
index 57609d6d..eeb39a7b 100644
--- a/plugins/by-name/vim-suda/default.nix
+++ b/plugins/by-name/vim-suda/default.nix
@@ -1,6 +1,6 @@
 { lib, helpers, ... }:
 
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-suda";
   globalPrefix = "suda#";
   maintainers = [ lib.maintainers.marcel ];
diff --git a/plugins/by-name/vim-surround/default.nix b/plugins/by-name/vim-surround/default.nix
index 5997a0c0..fcd1708a 100644
--- a/plugins/by-name/vim-surround/default.nix
+++ b/plugins/by-name/vim-surround/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-surround";
   packPathName = "surround.vim";
   package = "vim-surround";
diff --git a/plugins/by-name/vimtex/default.nix b/plugins/by-name/vimtex/default.nix
index f594d699..af943d0c 100644
--- a/plugins/by-name/vimtex/default.nix
+++ b/plugins/by-name/vimtex/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vimtex";
   globalPrefix = "vimtex_";
 
diff --git a/plugins/by-name/wakatime/default.nix b/plugins/by-name/wakatime/default.nix
index bd660c52..37e533ed 100644
--- a/plugins/by-name/wakatime/default.nix
+++ b/plugins/by-name/wakatime/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "wakatime";
   packPathName = "vim-wakatime";
   package = "vim-wakatime";
diff --git a/plugins/by-name/zig/default.nix b/plugins/by-name/zig/default.nix
index e7c20f48..7778adf5 100644
--- a/plugins/by-name/zig/default.nix
+++ b/plugins/by-name/zig/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "zig";
   packPathName = "zig.vim";
diff --git a/plugins/cmp/sources/_mk-cmp-plugin.nix b/plugins/cmp/sources/_mk-cmp-plugin.nix
index 7ac66206..cad16699 100644
--- a/plugins/cmp/sources/_mk-cmp-plugin.nix
+++ b/plugins/cmp/sources/_mk-cmp-plugin.nix
@@ -14,7 +14,7 @@
   imports ? [ ],
   ...
 }@args:
-lib.nixvim.vim-plugin.mkVimPlugin (
+lib.nixvim.plugins.mkVimPlugin (
   builtins.removeAttrs args [
     "pluginName"
     "sourceName"
diff --git a/plugins/colorschemes/dracula.nix b/plugins/colorschemes/dracula.nix
index 01d96638..947b58da 100644
--- a/plugins/colorschemes/dracula.nix
+++ b/plugins/colorschemes/dracula.nix
@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "dracula";
   package = "dracula-vim";
   isColorscheme = true;
diff --git a/plugins/colorschemes/everforest.nix b/plugins/colorschemes/everforest.nix
index cf78ee9b..3837ffaf 100644
--- a/plugins/colorschemes/everforest.nix
+++ b/plugins/colorschemes/everforest.nix
@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "everforest";
   isColorscheme = true;
   globalPrefix = "everforest_";
diff --git a/plugins/colorschemes/melange.nix b/plugins/colorschemes/melange.nix
index 8be5685b..fd902eed 100644
--- a/plugins/colorschemes/melange.nix
+++ b/plugins/colorschemes/melange.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "melange";
   isColorscheme = true;
   packPathName = "melange-nvim";
diff --git a/plugins/colorschemes/nord.nix b/plugins/colorschemes/nord.nix
index 4c81ed10..53cbefa8 100644
--- a/plugins/colorschemes/nord.nix
+++ b/plugins/colorschemes/nord.nix
@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "nord";
   isColorscheme = true;
   packPathName = "nord.nvim";
diff --git a/plugins/colorschemes/one.nix b/plugins/colorschemes/one.nix
index 134139ff..2f91e267 100644
--- a/plugins/colorschemes/one.nix
+++ b/plugins/colorschemes/one.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "one";
   isColorscheme = true;
   packPathName = "vim-one";
diff --git a/plugins/colorschemes/oxocarbon.nix b/plugins/colorschemes/oxocarbon.nix
index 45b79b09..bc23929f 100644
--- a/plugins/colorschemes/oxocarbon.nix
+++ b/plugins/colorschemes/oxocarbon.nix
@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "oxocarbon";
   isColorscheme = true;
   packPathName = "oxocarbon.nvim";