diff --git a/lib/neovim-plugin.nix b/lib/neovim-plugin.nix
index d04c8811..357b09bf 100644
--- a/lib/neovim-plugin.nix
+++ b/lib/neovim-plugin.nix
@@ -28,13 +28,12 @@ with lib;
       colorscheme ? name,
       # options
       originalName ? name,
-      # WARNING: `defaultPackage` is deprecated by `package`,
-      defaultPackage ? throw "mkVimPlugin called without either `package` or `defaultPackage`.",
       # Can be a string, a list of strings, or a module option:
       # - A string will be intrpreted as `pkgs.vimPlugins.${package}`
       # - A list will be interpreted as a "pkgs path", e.g. `pkgs.${elem1}.${elem2}.${etc...}`
       # - An option will be used as-is, but should be built using `lib.mkPackageOption`
-      package ? helpers.mkPluginPackageOption originalName defaultPackage,
+      # Defaults to `name`, i.e. `pkgs.vimPlugins.${name}`
+      package ? name,
       settingsOptions ? { },
       settingsExample ? null,
       settingsDescription ? "Options provided to the `require('${luaName}')${setup}` function.",
diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix
index b1bdc9af..e221c585 100644
--- a/lib/vim-plugin.nix
+++ b/lib/vim-plugin.nix
@@ -16,13 +16,12 @@ with lib;
       colorscheme ? name,
       # options
       originalName ? name,
-      # WARNING: `defaultPackage` is deprecated by `package`,
-      defaultPackage ? throw "mkVimPlugin called without either `package` or `defaultPackage`.",
       # Can be a string, a list of strings, or a module option:
       # - A string will be intrpreted as `pkgs.vimPlugins.${package}`
       # - A list will be interpreted as a "pkgs path", e.g. `pkgs.${elem1}.${elem2}.${etc...}`
       # - An option will be used as-is, but should be built using `lib.mkPackageOption`
-      package ? helpers.mkPluginPackageOption originalName defaultPackage,
+      # Defaults to `name`, i.e. `pkgs.vimPlugins.${name}`
+      package ? name,
       settingsOptions ? { },
       settingsExample ? null,
       globalPrefix ? "",
diff --git a/plugins/ai/chatgpt.nix b/plugins/ai/chatgpt.nix
index b2b15fda..2910070d 100644
--- a/plugins/ai/chatgpt.nix
+++ b/plugins/ai/chatgpt.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "chatgpt";
   originalName = "ChatGPT.nvim";
-  defaultPackage = pkgs.vimPlugins.ChatGPT-nvim;
+  package = "ChatGPT-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ai/copilot-chat.nix b/plugins/ai/copilot-chat.nix
index 82fbed7f..7d0ed715 100644
--- a/plugins/ai/copilot-chat.nix
+++ b/plugins/ai/copilot-chat.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "copilot-chat";
   originalName = "CopilotChat.nvim";
   luaName = "CopilotChat";
-  defaultPackage = pkgs.vimPlugins.CopilotChat-nvim;
+  package = "CopilotChat-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/bufferlines/barbar.nix b/plugins/bufferlines/barbar.nix
index 2a063371..2b1475b2 100644
--- a/plugins/bufferlines/barbar.nix
+++ b/plugins/bufferlines/barbar.nix
@@ -53,7 +53,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "barbar";
   originalName = "barbar.nvim";
-  defaultPackage = pkgs.vimPlugins.barbar-nvim;
+  package = "barbar-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/bufferlines/barbecue.nix b/plugins/bufferlines/barbecue.nix
index 96144988..eba56c2e 100644
--- a/plugins/bufferlines/barbecue.nix
+++ b/plugins/bufferlines/barbecue.nix
@@ -1,15 +1,11 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "barbecue";
   originalName = "barbecue.nvim";
-  defaultPackage = pkgs.vimPlugins.barbecue-nvim;
+  package = "barbecue-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix
index f451ea2b..b3ba88c4 100644
--- a/plugins/bufferlines/bufferline.nix
+++ b/plugins/bufferlines/bufferline.nix
@@ -10,7 +10,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "bufferline";
   originalName = "bufferline.nvim";
-  defaultPackage = pkgs.vimPlugins.bufferline-nvim;
+  package = "bufferline-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/bufferlines/navic.nix b/plugins/bufferlines/navic.nix
index 0e8e1cf5..3e3d0dc1 100644
--- a/plugins/bufferlines/navic.nix
+++ b/plugins/bufferlines/navic.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
@@ -10,7 +6,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "navic";
   originalName = "nvim-navic";
   luaName = "nvim-navic";
-  defaultPackage = pkgs.vimPlugins.nvim-navic;
+  package = "nvim-navic";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/colorschemes/ayu.nix b/plugins/colorschemes/ayu.nix
index 754e9008..b0e576fc 100644
--- a/plugins/colorschemes/ayu.nix
+++ b/plugins/colorschemes/ayu.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "ayu";
   isColorscheme = true;
   originalName = "neovim-ayu";
-  defaultPackage = pkgs.vimPlugins.neovim-ayu;
+  package = "neovim-ayu";
   # The colorscheme option is set by the `setup` function.
   colorscheme = null;
   callSetup = false;
diff --git a/plugins/colorschemes/base16/default.nix b/plugins/colorschemes/base16/default.nix
index c73581d6..9737c68c 100644
--- a/plugins/colorschemes/base16/default.nix
+++ b/plugins/colorschemes/base16/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -13,7 +12,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   inherit name luaName originalName;
   setup = ".with_config";
-  defaultPackage = pkgs.vimPlugins.base16-nvim;
+  package = "base16-nvim";
   isColorscheme = true;
 
   maintainers = with lib.maintainers; [
diff --git a/plugins/colorschemes/catppuccin.nix b/plugins/colorschemes/catppuccin.nix
index 9fa32fa2..f1ae8331 100644
--- a/plugins/colorschemes/catppuccin.nix
+++ b/plugins/colorschemes/catppuccin.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "catppuccin";
   isColorscheme = true;
-  defaultPackage = pkgs.vimPlugins.catppuccin-nvim;
+  package = "catppuccin-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/cyberdream.nix b/plugins/colorschemes/cyberdream.nix
index fbd762e4..cb591069 100644
--- a/plugins/colorschemes/cyberdream.nix
+++ b/plugins/colorschemes/cyberdream.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "cyberdream";
   isColorscheme = true;
   originalName = "cyberdream.nvim";
-  defaultPackage = pkgs.vimPlugins.cyberdream-nvim;
+  package = "cyberdream-nvim";
 
   maintainers = [ lib.nixvim.maintainers.AndresBermeoMarinelli ];
 
diff --git a/plugins/colorschemes/dracula-nvim.nix b/plugins/colorschemes/dracula-nvim.nix
index 92ecb1ea..f9cd1479 100644
--- a/plugins/colorschemes/dracula-nvim.nix
+++ b/plugins/colorschemes/dracula-nvim.nix
@@ -1,14 +1,9 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "dracula-nvim";
   originalName = "dracula.nvim ";
   luaName = "dracula";
   colorscheme = "dracula";
-  defaultPackage = pkgs.vimPlugins.dracula-nvim;
   isColorscheme = true;
 
   maintainers = [ lib.nixvim.maintainers.refaelsh ];
diff --git a/plugins/colorschemes/everforest.nix b/plugins/colorschemes/everforest.nix
index 2260b704..355ae41b 100644
--- a/plugins/colorschemes/everforest.nix
+++ b/plugins/colorschemes/everforest.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -17,7 +16,6 @@ in
 lib.nixvim.vim-plugin.mkVimPlugin {
   name = "everforest";
   isColorscheme = true;
-  defaultPackage = pkgs.vimPlugins.everforest;
   globalPrefix = "everforest_";
 
   maintainers = [ lib.nixvim.maintainers.sheemap ];
diff --git a/plugins/colorschemes/gruvbox.nix b/plugins/colorschemes/gruvbox.nix
index 93a2c5f3..d0f3687e 100644
--- a/plugins/colorschemes/gruvbox.nix
+++ b/plugins/colorschemes/gruvbox.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   ...
 }:
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "gruvbox";
   isColorscheme = true;
   originalName = "gruvbox.nvim";
-  defaultPackage = pkgs.vimPlugins.gruvbox-nvim;
+  package = "gruvbox-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/kanagawa.nix b/plugins/colorschemes/kanagawa.nix
index 6e4e3e67..811ab30b 100644
--- a/plugins/colorschemes/kanagawa.nix
+++ b/plugins/colorschemes/kanagawa.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "kanagawa";
   isColorscheme = true;
   originalName = "kanagawa.nvim";
-  defaultPackage = pkgs.vimPlugins.kanagawa-nvim;
+  package = "kanagawa-nvim";
 
   description = ''
     You can select the theme in two ways:
diff --git a/plugins/colorschemes/melange.nix b/plugins/colorschemes/melange.nix
index 58128d66..16373fa1 100644
--- a/plugins/colorschemes/melange.nix
+++ b/plugins/colorschemes/melange.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   ...
 }:
 lib.nixvim.vim-plugin.mkVimPlugin {
   name = "melange";
   isColorscheme = true;
   originalName = "melange-nvim";
-  defaultPackage = pkgs.vimPlugins.melange-nvim;
+  package = "melange-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/modus.nix b/plugins/colorschemes/modus.nix
index bc25d45b..3ec98435 100644
--- a/plugins/colorschemes/modus.nix
+++ b/plugins/colorschemes/modus.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "modus";
   luaName = "modus-themes";
   originalName = "modus-themes.nvim";
-  defaultPackage = pkgs.vimPlugins.modus-themes-nvim;
+  package = "modus-themes-nvim";
   isColorscheme = true;
 
   maintainers = [ lib.nixvim.maintainers.nwjsmith ];
diff --git a/plugins/colorschemes/nightfox.nix b/plugins/colorschemes/nightfox.nix
index 91ea533d..3e657846 100644
--- a/plugins/colorschemes/nightfox.nix
+++ b/plugins/colorschemes/nightfox.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "nightfox";
   isColorscheme = true;
   originalName = "nightfox.nvim";
-  defaultPackage = pkgs.vimPlugins.nightfox-nvim;
+  package = "nightfox-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/nord.nix b/plugins/colorschemes/nord.nix
index d440fbc1..ffc2e427 100644
--- a/plugins/colorschemes/nord.nix
+++ b/plugins/colorschemes/nord.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.vim-plugin.mkVimPlugin {
   name = "nord";
   isColorscheme = true;
   originalName = "nord.nvim";
-  defaultPackage = pkgs.vimPlugins.nord-nvim;
+  package = "nord-nvim";
   globalPrefix = "nord_";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/colorschemes/one.nix b/plugins/colorschemes/one.nix
index a7a3873b..76e9c334 100644
--- a/plugins/colorschemes/one.nix
+++ b/plugins/colorschemes/one.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   ...
 }:
 lib.nixvim.vim-plugin.mkVimPlugin {
   name = "one";
   isColorscheme = true;
   originalName = "vim-one";
-  defaultPackage = pkgs.vimPlugins.vim-one;
+  package = "vim-one";
   globalPrefix = "one_";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/colorschemes/onedark.nix b/plugins/colorschemes/onedark.nix
index 62fd158e..aa5ac73f 100644
--- a/plugins/colorschemes/onedark.nix
+++ b/plugins/colorschemes/onedark.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   ...
 }:
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "onedark";
   isColorscheme = true;
   originalName = "onedark.nvim";
-  defaultPackage = pkgs.vimPlugins.onedark-nvim;
+  package = "onedark-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/oxocarbon.nix b/plugins/colorschemes/oxocarbon.nix
index 20690eed..a520bd18 100644
--- a/plugins/colorschemes/oxocarbon.nix
+++ b/plugins/colorschemes/oxocarbon.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   ...
 }:
 lib.nixvim.vim-plugin.mkVimPlugin {
   name = "oxocarbon";
   isColorscheme = true;
   originalName = "oxocarbon.nvim";
-  defaultPackage = pkgs.vimPlugins.oxocarbon-nvim;
+  package = "oxocarbon-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/palette.nix b/plugins/colorschemes/palette.nix
index bf26ba0c..e4ccca4f 100644
--- a/plugins/colorschemes/palette.nix
+++ b/plugins/colorschemes/palette.nix
@@ -10,7 +10,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "palette";
   isColorscheme = true;
   originalName = "palette.nvim";
-  defaultPackage = pkgs.vimPlugins.palette-nvim;
+  package = "palette-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/poimandres.nix b/plugins/colorschemes/poimandres.nix
index 8fe350f3..1ce0483b 100644
--- a/plugins/colorschemes/poimandres.nix
+++ b/plugins/colorschemes/poimandres.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "poimandres";
   isColorscheme = true;
   originalName = "poimandres.nvim";
-  defaultPackage = pkgs.vimPlugins.poimandres-nvim;
+  package = "poimandres-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/rose-pine.nix b/plugins/colorschemes/rose-pine.nix
index dfa3ebee..f37efec1 100644
--- a/plugins/colorschemes/rose-pine.nix
+++ b/plugins/colorschemes/rose-pine.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -9,7 +8,6 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "rose-pine";
   isColorscheme = true;
-  defaultPackage = pkgs.vimPlugins.rose-pine;
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/tokyonight.nix b/plugins/colorschemes/tokyonight.nix
index c2dd2fcf..571bc706 100644
--- a/plugins/colorschemes/tokyonight.nix
+++ b/plugins/colorschemes/tokyonight.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "tokyonight";
   isColorscheme = true;
   originalName = "tokyonight.nvim";
-  defaultPackage = pkgs.vimPlugins.tokyonight-nvim;
+  package = "tokyonight-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/colorschemes/vscode.nix b/plugins/colorschemes/vscode.nix
index 49368107..11757cbb 100644
--- a/plugins/colorschemes/vscode.nix
+++ b/plugins/colorschemes/vscode.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "vscode";
   isColorscheme = true;
   originalName = "vscode-nvim";
-  defaultPackage = pkgs.vimPlugins.vscode-nvim;
+  package = "vscode-nvim";
   colorscheme = null; # Color scheme is set by `require.("vscode").load()`
   callSetup = false;
 
diff --git a/plugins/completion/cmp/default.nix b/plugins/completion/cmp/default.nix
index 11b16069..89050c19 100644
--- a/plugins/completion/cmp/default.nix
+++ b/plugins/completion/cmp/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "cmp";
   originalName = "nvim-cmp";
-  defaultPackage = pkgs.vimPlugins.nvim-cmp;
+  package = "nvim-cmp";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/completion/codeium-vim.nix b/plugins/completion/codeium-vim.nix
index e5d0a292..4e7e8180 100644
--- a/plugins/completion/codeium-vim.nix
+++ b/plugins/completion/codeium-vim.nix
@@ -37,7 +37,6 @@ in
 helpers.vim-plugin.mkVimPlugin {
   name = "codeium-vim";
   originalName = "codeium.vim";
-  defaultPackage = pkgs.vimPlugins.codeium-vim;
   globalPrefix = "codeium_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/completion/copilot-vim.nix b/plugins/completion/copilot-vim.nix
index 78c13941..93c4b510 100644
--- a/plugins/completion/copilot-vim.nix
+++ b/plugins/completion/copilot-vim.nix
@@ -9,7 +9,6 @@ with helpers.vim-plugin;
 helpers.vim-plugin.mkVimPlugin {
   name = "copilot-vim";
   originalName = "copilot.vim";
-  defaultPackage = pkgs.vimPlugins.copilot-vim;
   globalPrefix = "copilot_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/completion/coq.nix b/plugins/completion/coq.nix
index 8dd6a7fd..129215f5 100644
--- a/plugins/completion/coq.nix
+++ b/plugins/completion/coq.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "coq-nvim";
   originalName = "coq_nvim";
-  defaultPackage = pkgs.vimPlugins.coq_nvim;
+  package = "coq_nvim";
 
   maintainers = [
     maintainers.traxys
diff --git a/plugins/filetrees/yazi.nix b/plugins/filetrees/yazi.nix
index 2c53d307..4cad6a37 100644
--- a/plugins/filetrees/yazi.nix
+++ b/plugins/filetrees/yazi.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "yazi";
   originalName = "yazi.nvim";
-  defaultPackage = pkgs.vimPlugins.yazi-nvim;
+  package = "yazi-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/git/committia.nix b/plugins/git/committia.nix
index f7279478..31f1d2cd 100644
--- a/plugins/git/committia.nix
+++ b/plugins/git/committia.nix
@@ -6,7 +6,7 @@
 helpers.vim-plugin.mkVimPlugin {
   name = "committia";
   originalName = "committia.vim";
-  defaultPackage = pkgs.vimPlugins.committia-vim;
+  package = "committia-vim";
   globalPrefix = "committia_";
 
   maintainers = [ helpers.maintainers.alisonjenkins ];
diff --git a/plugins/git/fugitive.nix b/plugins/git/fugitive.nix
index e8ae1474..08e5846c 100644
--- a/plugins/git/fugitive.nix
+++ b/plugins/git/fugitive.nix
@@ -7,7 +7,7 @@
 helpers.vim-plugin.mkVimPlugin {
   name = "fugitive";
   originalName = "vim-fugitive";
-  defaultPackage = pkgs.vimPlugins.vim-fugitive;
+  package = "vim-fugitive";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/git/git-conflict.nix b/plugins/git/git-conflict.nix
index be1274d0..13902177 100644
--- a/plugins/git/git-conflict.nix
+++ b/plugins/git/git-conflict.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "git-conflict";
   originalName = "git-conflict.nvim";
-  defaultPackage = pkgs.vimPlugins.git-conflict-nvim;
+  package = "git-conflict-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/git/gitblame.nix b/plugins/git/gitblame.nix
index 1bfbb52f..a84e520b 100644
--- a/plugins/git/gitblame.nix
+++ b/plugins/git/gitblame.nix
@@ -10,7 +10,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "gitblame";
   originalName = "git-blame.nvim";
-  defaultPackage = pkgs.vimPlugins.git-blame-nvim;
+  package = "git-blame-nvim";
 
   maintainers = with lib.maintainers; [ GaetanLepage ];
 
diff --git a/plugins/git/gitignore.nix b/plugins/git/gitignore.nix
index c86623fb..676753f3 100644
--- a/plugins/git/gitignore.nix
+++ b/plugins/git/gitignore.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -10,7 +9,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "gitignore";
   originalName = "gitignore.nvim";
-  defaultPackage = pkgs.vimPlugins.gitignore-nvim;
+  package = "gitignore-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/git/gitsigns/default.nix b/plugins/git/gitsigns/default.nix
index 730049f6..0dd85ae9 100644
--- a/plugins/git/gitsigns/default.nix
+++ b/plugins/git/gitsigns/default.nix
@@ -9,7 +9,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "gitsigns";
   originalName = "gitsigns.nvim";
-  defaultPackage = pkgs.vimPlugins.gitsigns-nvim;
+  package = "gitsigns-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/git/lazygit.nix b/plugins/git/lazygit.nix
index 5395622b..55f22330 100644
--- a/plugins/git/lazygit.nix
+++ b/plugins/git/lazygit.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "lazygit";
   originalName = "lazygit.nvim";
-  defaultPackage = pkgs.vimPlugins.lazygit-nvim;
+  package = "lazygit-nvim";
   globalPrefix = "lazygit_";
 
   maintainers = [ helpers.maintainers.AndresBermeoMarinelli ];
diff --git a/plugins/git/neogit/default.nix b/plugins/git/neogit/default.nix
index 534d59bb..d2132525 100644
--- a/plugins/git/neogit/default.nix
+++ b/plugins/git/neogit/default.nix
@@ -8,7 +8,6 @@
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "neogit";
-  defaultPackage = pkgs.vimPlugins.neogit;
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/git/octo.nix b/plugins/git/octo.nix
index e8e893cf..08e330db 100644
--- a/plugins/git/octo.nix
+++ b/plugins/git/octo.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "octo";
   originalName = "octo.nvim";
-  defaultPackage = pkgs.vimPlugins.octo-nvim;
+  package = "octo-nvim";
 
   maintainers = [ helpers.maintainers.svl ];
 
diff --git a/plugins/languages/cmake-tools.nix b/plugins/languages/cmake-tools.nix
index 3e4efc21..91eabd41 100644
--- a/plugins/languages/cmake-tools.nix
+++ b/plugins/languages/cmake-tools.nix
@@ -1,13 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "cmake-tools";
   originalName = "cmake-tools.nvim";
-  defaultPackage = pkgs.vimPlugins.cmake-tools-nvim;
+  package = "cmake-tools-nvim";
 
   maintainers = [ helpers.maintainers.NathanFelber ];
 
diff --git a/plugins/languages/debugprint.nix b/plugins/languages/debugprint.nix
index 6389002e..a9cb88f6 100644
--- a/plugins/languages/debugprint.nix
+++ b/plugins/languages/debugprint.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "debugprint";
   originalName = "debugprint.nvim";
-  defaultPackage = pkgs.vimPlugins.debugprint-nvim;
+  package = "debugprint-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/godot.nix b/plugins/languages/godot.nix
index 459410e5..4e82c93a 100644
--- a/plugins/languages/godot.nix
+++ b/plugins/languages/godot.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "godot";
   originalName = "vim-godot";
-  defaultPackage = pkgs.vimPlugins.vim-godot;
+  package = "vim-godot";
   globalPrefix = "godot_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/languages/haskell-scope-highlighting.nix b/plugins/languages/haskell-scope-highlighting.nix
index dd250afa..5ad65fc0 100644
--- a/plugins/languages/haskell-scope-highlighting.nix
+++ b/plugins/languages/haskell-scope-highlighting.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   helpers,
   config,
   ...
@@ -9,7 +8,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "haskell-scope-highlighting";
   originalName = "haskell-scope-highlighting.nvim";
-  defaultPackage = pkgs.vimPlugins.haskell-scope-highlighting-nvim;
+  package = "haskell-scope-highlighting-nvim";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/julia/julia-cell.nix b/plugins/languages/julia/julia-cell.nix
index e43e14ef..0016b00b 100644
--- a/plugins/languages/julia/julia-cell.nix
+++ b/plugins/languages/julia/julia-cell.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 let
@@ -39,7 +38,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "julia-cell";
   originalName = "vim-julia-cell";
-  defaultPackage = pkgs.vimPlugins.vim-julia-cell;
+  package = "vim-julia-cell";
   globalPrefix = "julia_cell_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix
index 09cc5c34..56a92374 100644
--- a/plugins/languages/ledger.nix
+++ b/plugins/languages/ledger.nix
@@ -9,7 +9,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "ledger";
   originalName = "vim-ledger";
-  defaultPackage = pkgs.vimPlugins.vim-ledger;
+  package = "vim-ledger";
   globalPrefix = "ledger_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/languages/ltex-extra.nix b/plugins/languages/ltex-extra.nix
index 905cb323..e330ee96 100644
--- a/plugins/languages/ltex-extra.nix
+++ b/plugins/languages/ltex-extra.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "ltex-extra";
   originalName = "ltex_extra.nvim";
-  defaultPackage = pkgs.vimPlugins.ltex_extra-nvim;
+  package = "ltex_extra-nvim";
 
   maintainers = [ maintainers.loicreynier ];
 
diff --git a/plugins/languages/markdown/glow.nix b/plugins/languages/markdown/glow.nix
index e7908587..9b15b9dd 100644
--- a/plugins/languages/markdown/glow.nix
+++ b/plugins/languages/markdown/glow.nix
@@ -7,7 +7,7 @@
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "glow";
   originalName = "glow.nvim";
-  defaultPackage = pkgs.vimPlugins.glow-nvim;
+  package = "glow-nvim";
 
   maintainers = [ lib.maintainers.getchoo ];
 
diff --git a/plugins/languages/markdown/markdown-preview.nix b/plugins/languages/markdown/markdown-preview.nix
index eee7d1a6..3d3fe569 100644
--- a/plugins/languages/markdown/markdown-preview.nix
+++ b/plugins/languages/markdown/markdown-preview.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "markdown-preview";
   originalName = "markdown-preview.nvim";
-  defaultPackage = pkgs.vimPlugins.markdown-preview-nvim;
+  package = "markdown-preview-nvim";
   globalPrefix = "mkdp_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/languages/markdown/markview.nix b/plugins/languages/markdown/markview.nix
index ac9b6bd9..4cd3b205 100644
--- a/plugins/languages/markdown/markview.nix
+++ b/plugins/languages/markdown/markview.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "markview";
   originalName = "markview.nvim";
-  defaultPackage = pkgs.vimPlugins.markview-nvim;
+  package = "markview-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/languages/markdown/preview.nix b/plugins/languages/markdown/preview.nix
index 9ea8e62c..f8e138c9 100644
--- a/plugins/languages/markdown/preview.nix
+++ b/plugins/languages/markdown/preview.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "preview";
   originalName = "Preview.nvim";
-  defaultPackage = pkgs.vimPlugins.Preview-nvim;
+  package = "Preview-nvim";
 
   hasSettings = false;
 
diff --git a/plugins/languages/nix.nix b/plugins/languages/nix.nix
index 49547275..7a462265 100644
--- a/plugins/languages/nix.nix
+++ b/plugins/languages/nix.nix
@@ -1,13 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "nix";
   originalName = "vim-nix";
-  defaultPackage = pkgs.vimPlugins.vim-nix;
+  package = "vim-nix";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 }
diff --git a/plugins/languages/nvim-orgmode.nix b/plugins/languages/nvim-orgmode.nix
index 70430ba0..15876a6e 100644
--- a/plugins/languages/nvim-orgmode.nix
+++ b/plugins/languages/nvim-orgmode.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -9,7 +8,6 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "orgmode";
   originalName = "nvim-orgmode";
-  defaultPackage = pkgs.vimPlugins.orgmode;
 
   maintainers = [ lib.nixvim.maintainers.refaelsh ];
 
diff --git a/plugins/languages/otter.nix b/plugins/languages/otter.nix
index f3df1eeb..1f694fd4 100644
--- a/plugins/languages/otter.nix
+++ b/plugins/languages/otter.nix
@@ -2,13 +2,12 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "otter";
   originalName = "otter.nvim";
-  defaultPackage = pkgs.vimPlugins.otter-nvim;
+  package = "otter-nvim";
 
   maintainers = [ lib.maintainers.perchun ];
 
diff --git a/plugins/languages/parinfer-rust.nix b/plugins/languages/parinfer-rust.nix
index 8ba12d6f..60f99bdc 100644
--- a/plugins/languages/parinfer-rust.nix
+++ b/plugins/languages/parinfer-rust.nix
@@ -1,12 +1,10 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "parinfer-rust";
-  defaultPackage = pkgs.vimPlugins.parinfer-rust;
   globalPrefix = "parinfer_";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/languages/python/jupytext.nix b/plugins/languages/python/jupytext.nix
index 77b4a206..5e195477 100644
--- a/plugins/languages/python/jupytext.nix
+++ b/plugins/languages/python/jupytext.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "jupytext";
   originalName = "jupytext.nvim";
-  defaultPackage = pkgs.vimPlugins.jupytext-nvim;
+  package = "jupytext-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/qmk.nix b/plugins/languages/qmk.nix
index 23c45639..603026ce 100644
--- a/plugins/languages/qmk.nix
+++ b/plugins/languages/qmk.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "qmk";
   originalName = "qmk.nvim";
-  defaultPackage = pkgs.vimPlugins.qmk-nvim;
+  package = "qmk-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/rust/rustaceanvim/default.nix b/plugins/languages/rust/rustaceanvim/default.nix
index 2bb16f4d..8f8ea36f 100644
--- a/plugins/languages/rust/rustaceanvim/default.nix
+++ b/plugins/languages/rust/rustaceanvim/default.nix
@@ -8,7 +8,6 @@
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "rustaceanvim";
-  defaultPackage = pkgs.vimPlugins.rustaceanvim;
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/sniprun.nix b/plugins/languages/sniprun.nix
index e31508d2..e3b4f248 100644
--- a/plugins/languages/sniprun.nix
+++ b/plugins/languages/sniprun.nix
@@ -1,13 +1,11 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "sniprun";
-  defaultPackage = pkgs.vimPlugins.sniprun;
   url = "https://github.com/michaelb/sniprun";
 
   maintainers = with maintainers; [
diff --git a/plugins/languages/tagbar.nix b/plugins/languages/tagbar.nix
index db49fd5a..255631ff 100644
--- a/plugins/languages/tagbar.nix
+++ b/plugins/languages/tagbar.nix
@@ -6,7 +6,6 @@
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "tagbar";
-  defaultPackage = pkgs.vimPlugins.tagbar;
   globalPrefix = "tagbar_";
   extraPackages = [ pkgs.ctags ];
 
diff --git a/plugins/languages/texpresso.nix b/plugins/languages/texpresso.nix
index 503cd0f6..71f1b135 100644
--- a/plugins/languages/texpresso.nix
+++ b/plugins/languages/texpresso.nix
@@ -10,7 +10,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "texpresso";
   originalName = "texpresso.vim";
-  defaultPackage = pkgs.vimPlugins.texpresso-vim;
+  package = "texpresso-vim";
 
   maintainers = [ maintainers.nickhu ];
 
diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/languages/treesitter/treesitter-context.nix
index 950bfc96..1a3c2cfc 100644
--- a/plugins/languages/treesitter/treesitter-context.nix
+++ b/plugins/languages/treesitter/treesitter-context.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "treesitter-context";
   originalName = "nvim-treesitter-context";
-  defaultPackage = pkgs.vimPlugins.nvim-treesitter-context;
+  package = "nvim-treesitter-context";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/languages/treesitter/treesitter.nix
index 5f510e4e..792c57f0 100644
--- a/plugins/languages/treesitter/treesitter.nix
+++ b/plugins/languages/treesitter/treesitter.nix
@@ -10,7 +10,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "treesitter";
   originalName = "nvim-treesitter";
   luaName = "nvim-treesitter.configs";
-  defaultPackage = pkgs.vimPlugins.nvim-treesitter;
+  package = "nvim-treesitter";
 
   description = ''
     Provides an interface to [tree-sitter]
diff --git a/plugins/languages/treesitter/ts-autotag.nix b/plugins/languages/treesitter/ts-autotag.nix
index 67f064d9..347e9e4c 100644
--- a/plugins/languages/treesitter/ts-autotag.nix
+++ b/plugins/languages/treesitter/ts-autotag.nix
@@ -2,7 +2,6 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
@@ -10,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "ts-autotag";
   originalName = "nvim-ts-autotag";
   luaName = "nvim-ts-autotag";
-  defaultPackage = pkgs.vimPlugins.nvim-ts-autotag;
+  package = "nvim-ts-autotag";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/languages/typst/typst-vim.nix b/plugins/languages/typst/typst-vim.nix
index f2bdffac..eedb5943 100644
--- a/plugins/languages/typst/typst-vim.nix
+++ b/plugins/languages/typst/typst-vim.nix
@@ -8,7 +8,6 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "typst-vim";
   originalName = "typst.vim";
-  defaultPackage = pkgs.vimPlugins.typst-vim;
   globalPrefix = "typst_";
 
   # Add the typst compiler to nixvim packages
diff --git a/plugins/languages/vim-slime.nix b/plugins/languages/vim-slime.nix
index d145b428..6528f75b 100644
--- a/plugins/languages/vim-slime.nix
+++ b/plugins/languages/vim-slime.nix
@@ -1,14 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
 mkVimPlugin {
   name = "vim-slime";
-  defaultPackage = pkgs.vimPlugins.vim-slime;
   globalPrefix = "slime_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/languages/vimtex.nix b/plugins/languages/vimtex.nix
index ef3e6088..9a67dda5 100644
--- a/plugins/languages/vimtex.nix
+++ b/plugins/languages/vimtex.nix
@@ -7,7 +7,6 @@
 with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "vimtex";
-  defaultPackage = pkgs.vimPlugins.vimtex;
   globalPrefix = "vimtex_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/languages/zig.nix b/plugins/languages/zig.nix
index fdb3efa0..f7309320 100644
--- a/plugins/languages/zig.nix
+++ b/plugins/languages/zig.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "zig";
   originalName = "zig.vim";
-  defaultPackage = pkgs.vimPlugins.zig-vim;
+  package = "zig-vim";
   globalPrefix = "zig_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/lsp/conform-nvim.nix b/plugins/lsp/conform-nvim.nix
index 0648adae..7955a05a 100644
--- a/plugins/lsp/conform-nvim.nix
+++ b/plugins/lsp/conform-nvim.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "conform-nvim";
   luaName = "conform";
   originalName = "conform.nvim";
-  defaultPackage = pkgs.vimPlugins.conform-nvim;
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/lsp/lsp-lines.nix b/plugins/lsp/lsp-lines.nix
index e9044d36..f24f9c85 100644
--- a/plugins/lsp/lsp-lines.nix
+++ b/plugins/lsp/lsp-lines.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "lsp-lines";
   luaName = "lsp_lines";
   originalName = "lsp_lines.nvim";
-  defaultPackage = pkgs.vimPlugins.lsp_lines-nvim;
+  package = "lsp_lines-nvim";
 
   # This plugin has no settings; it is configured via vim.diagnostic.config
   hasSettings = false;
diff --git a/plugins/lsp/lsp-status.nix b/plugins/lsp/lsp-status.nix
index bb1e4ace..c2d9be53 100644
--- a/plugins/lsp/lsp-status.nix
+++ b/plugins/lsp/lsp-status.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "lsp-status";
   originalName = "lsp-status.nvim";
-  defaultPackage = pkgs.vimPlugins.lsp-status-nvim;
+  package = "lsp-status-nvim";
   maintainers = [ helpers.maintainers.b3nb5n ];
 
   settingsOptions =
diff --git a/plugins/lsp/nvim-lightbulb.nix b/plugins/lsp/nvim-lightbulb.nix
index 1e138fb9..a3672bb3 100644
--- a/plugins/lsp/nvim-lightbulb.nix
+++ b/plugins/lsp/nvim-lightbulb.nix
@@ -1,13 +1,11 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "nvim-lightbulb";
-  defaultPackage = pkgs.vimPlugins.nvim-lightbulb;
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/lsp/schemastore.nix b/plugins/lsp/schemastore.nix
index 4cc9164c..2e00988c 100644
--- a/plugins/lsp/schemastore.nix
+++ b/plugins/lsp/schemastore.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "schemastore";
   originalName = "SchemaStore.nvim";
-  defaultPackage = pkgs.vimPlugins.SchemaStore-nvim;
+  package = "SchemaStore-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/lsp/trouble.nix b/plugins/lsp/trouble.nix
index 717aba2e..8b808b55 100644
--- a/plugins/lsp/trouble.nix
+++ b/plugins/lsp/trouble.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "trouble";
   originalName = "trouble-nvim";
-  defaultPackage = pkgs.vimPlugins.trouble-nvim;
+  package = "trouble-nvim";
 
   maintainers = [ maintainers.loicreynier ];
 
diff --git a/plugins/neotest/default.nix b/plugins/neotest/default.nix
index 2a800bb3..931f4c3b 100644
--- a/plugins/neotest/default.nix
+++ b/plugins/neotest/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,6 @@ let
 in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neotest";
-  defaultPackage = pkgs.vimPlugins.neotest;
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/none-ls/default.nix b/plugins/none-ls/default.nix
index cf7175f9..b6ed75ca 100644
--- a/plugins/none-ls/default.nix
+++ b/plugins/none-ls/default.nix
@@ -3,7 +3,6 @@
   helpers,
   config,
   options,
-  pkgs,
   ...
 }:
 with lib;
@@ -11,7 +10,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "none-ls";
   originalName = "none-ls.nvim";
   luaName = "null-ls";
-  defaultPackage = pkgs.vimPlugins.none-ls-nvim;
+  package = "none-ls-nvim";
 
   maintainers = [ maintainers.MattSturgeon ];
 
diff --git a/plugins/pluginmanagers/lz-n.nix b/plugins/pluginmanagers/lz-n.nix
index 0f745609..81c55d4c 100644
--- a/plugins/pluginmanagers/lz-n.nix
+++ b/plugins/pluginmanagers/lz-n.nix
@@ -1,7 +1,6 @@
 {
   lib,
   options,
-  pkgs,
   ...
 }:
 with lib;
@@ -12,7 +11,6 @@ nixvim.neovim-plugin.mkNeovimPlugin {
   name = "lz-n";
   originalName = "lz.n";
   maintainers = [ maintainers.psfloyd ];
-  defaultPackage = pkgs.vimPlugins.lz-n;
 
   settingsDescription = ''
     Options provided to `vim.g.lz_n`.
diff --git a/plugins/snippets/nvim-snippets.nix b/plugins/snippets/nvim-snippets.nix
index 4c12bc86..30c500dc 100644
--- a/plugins/snippets/nvim-snippets.nix
+++ b/plugins/snippets/nvim-snippets.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -10,7 +9,6 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "nvim-snippets";
   luaName = "snippets";
-  defaultPackage = pkgs.vimPlugins.nvim-snippets;
 
   maintainers = [ lib.maintainers.psfloyd ];
 
diff --git a/plugins/statuslines/airline.nix b/plugins/statuslines/airline.nix
index 75fc9f06..f4b784ea 100644
--- a/plugins/statuslines/airline.nix
+++ b/plugins/statuslines/airline.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "airline";
   originalName = "vim-airline";
-  defaultPackage = pkgs.vimPlugins.vim-airline;
+  package = "vim-airline";
   globalPrefix = "airline_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/statuslines/lightline.nix b/plugins/statuslines/lightline.nix
index 40dfede7..fff1e451 100644
--- a/plugins/statuslines/lightline.nix
+++ b/plugins/statuslines/lightline.nix
@@ -1,7 +1,6 @@
 {
   lib,
   options,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "lightline";
   originalName = "lightline.vim";
-  defaultPackage = pkgs.vimPlugins.lightline-vim;
+  package = "lightline-vim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/telescope/default.nix b/plugins/telescope/default.nix
index db3361c5..775cdf04 100644
--- a/plugins/telescope/default.nix
+++ b/plugins/telescope/default.nix
@@ -17,7 +17,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "telescope";
   originalName = "telescope.nvim";
-  defaultPackage = pkgs.vimPlugins.telescope-nvim;
+  package = "telescope-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/edgy.nix b/plugins/ui/edgy.nix
index 6c0714fc..b1a4fd44 100644
--- a/plugins/ui/edgy.nix
+++ b/plugins/ui/edgy.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "edgy";
   originalName = "edgy.nvim";
-  defaultPackage = pkgs.vimPlugins.edgy-nvim;
+  package = "edgy-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/headlines.nix b/plugins/ui/headlines.nix
index 351cbcb0..7cb57898 100644
--- a/plugins/ui/headlines.nix
+++ b/plugins/ui/headlines.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "headlines";
   originalName = "headlines.nvim";
-  defaultPackage = pkgs.vimPlugins.headlines-nvim;
+  package = "headlines-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/neoscroll.nix b/plugins/ui/neoscroll.nix
index b91ee299..6932e914 100644
--- a/plugins/ui/neoscroll.nix
+++ b/plugins/ui/neoscroll.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   helpers,
   ...
@@ -8,7 +7,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "neoscroll";
   originalName = "neoscroll.nvim";
-  defaultPackage = pkgs.vimPlugins.neoscroll-nvim;
+  package = "neoscroll-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/specs.nix b/plugins/ui/specs.nix
index 91cddc71..6962361c 100644
--- a/plugins/ui/specs.nix
+++ b/plugins/ui/specs.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "specs";
   originalName = "specs.nvim";
-  defaultPackage = pkgs.vimPlugins.specs-nvim;
+  package = "specs-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/statuscol.nix b/plugins/ui/statuscol.nix
index e432db8d..e296bc1c 100644
--- a/plugins/ui/statuscol.nix
+++ b/plugins/ui/statuscol.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "statuscol";
   originalName = "statuscol.nvim";
-  defaultPackage = pkgs.vimPlugins.statuscol-nvim;
+  package = "statuscol-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/transparent.nix b/plugins/ui/transparent.nix
index cf56c2ae..9cafd695 100644
--- a/plugins/ui/transparent.nix
+++ b/plugins/ui/transparent.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "transparent";
   originalName = "transparent.nvim";
-  defaultPackage = pkgs.vimPlugins.transparent-nvim;
+  package = "transparent-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/twilight.nix b/plugins/ui/twilight.nix
index cd845ba7..32bdfbe4 100644
--- a/plugins/ui/twilight.nix
+++ b/plugins/ui/twilight.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "twilight";
   originalName = "twilight.nvim";
-  defaultPackage = pkgs.vimPlugins.twilight-nvim;
+  package = "twilight-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/ui/virt-column.nix b/plugins/ui/virt-column.nix
index 20817297..8d619fe9 100644
--- a/plugins/ui/virt-column.nix
+++ b/plugins/ui/virt-column.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "virt-column";
   originalName = "virt-column.nvim";
-  defaultPackage = pkgs.vimPlugins.virt-column-nvim;
+  package = "virt-column-nvim";
 
   maintainers = [ helpers.maintainers.alisonjenkins ];
 
diff --git a/plugins/ui/zen-mode.nix b/plugins/ui/zen-mode.nix
index 4c9b99c3..68cb1685 100644
--- a/plugins/ui/zen-mode.nix
+++ b/plugins/ui/zen-mode.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "zen-mode";
   originalName = "zen-mode.nvim";
-  defaultPackage = pkgs.vimPlugins.zen-mode-nvim;
+  package = "zen-mode-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/arrow.nix b/plugins/utils/arrow.nix
index b7cb495f..22cf0820 100644
--- a/plugins/utils/arrow.nix
+++ b/plugins/utils/arrow.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "arrow";
   originalName = "arrow.nvim";
-  defaultPackage = pkgs.vimPlugins.arrow-nvim;
+  package = "arrow-nvim";
 
   maintainers = [ maintainers.hmajid2301 ];
 
diff --git a/plugins/utils/auto-save.nix b/plugins/utils/auto-save.nix
index cc473597..62bb7e59 100644
--- a/plugins/utils/auto-save.nix
+++ b/plugins/utils/auto-save.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "auto-save";
   originalName = "auto-save.nvim";
-  defaultPackage = pkgs.vimPlugins.auto-save-nvim;
+  package = "auto-save-nvim";
 
   maintainers = [ helpers.maintainers.braindefender ];
 
diff --git a/plugins/utils/bacon.nix b/plugins/utils/bacon.nix
index 03b172dd..238617a7 100644
--- a/plugins/utils/bacon.nix
+++ b/plugins/utils/bacon.nix
@@ -1,11 +1,10 @@
 {
   helpers,
-  pkgs,
   ...
 }:
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "bacon";
-  defaultPackage = pkgs.vimPlugins.nvim-bacon;
+  package = "nvim-bacon";
   maintainers = [ helpers.maintainers.alisonjenkins ];
 
   settingsOptions = {
diff --git a/plugins/utils/baleia.nix b/plugins/utils/baleia.nix
index 6f955643..f7ce2efb 100644
--- a/plugins/utils/baleia.nix
+++ b/plugins/utils/baleia.nix
@@ -1,12 +1,11 @@
 {
   helpers,
-  pkgs,
   ...
 }:
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "baleia";
   originalName = "baleia.nvim";
-  defaultPackage = pkgs.vimPlugins.baleia-nvim;
+  package = "baleia-nvim";
 
   maintainers = [ helpers.maintainers.alisonjenkins ];
 
diff --git a/plugins/utils/better-escape.nix b/plugins/utils/better-escape.nix
index 98c76539..103957b2 100644
--- a/plugins/utils/better-escape.nix
+++ b/plugins/utils/better-escape.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "better-escape";
   originalName = "better-escape.nvim";
   luaName = "better_escape";
-  defaultPackage = pkgs.vimPlugins.better-escape-nvim;
+  package = "better-escape-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/bufdelete.nix b/plugins/utils/bufdelete.nix
index d97cc2fb..90b1186d 100644
--- a/plugins/utils/bufdelete.nix
+++ b/plugins/utils/bufdelete.nix
@@ -1,6 +1,5 @@
 {
   helpers,
-  pkgs,
   lib,
   ...
 }:
@@ -8,7 +7,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "bufdelete";
   originalName = "bufdelete.nvim";
-  defaultPackage = pkgs.vimPlugins.bufdelete-nvim;
+  package = "bufdelete-nvim";
   globalPrefix = "bufdelete_";
 
   maintainers = [ maintainers.MattSturgeon ];
diff --git a/plugins/utils/ccc.nix b/plugins/utils/ccc.nix
index 11d64cf5..964d2e2b 100644
--- a/plugins/utils/ccc.nix
+++ b/plugins/utils/ccc.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "ccc";
   originalName = "ccc.nvim";
-  defaultPackage = pkgs.vimPlugins.ccc-nvim;
+  package = "ccc-nvim";
 
   maintainers = [ helpers.maintainers.JanKremer ];
 
diff --git a/plugins/utils/cloak.nix b/plugins/utils/cloak.nix
index 13a93187..4c4024fe 100644
--- a/plugins/utils/cloak.nix
+++ b/plugins/utils/cloak.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "cloak";
   originalName = "cloak.nvim";
-  defaultPackage = pkgs.vimPlugins.cloak-nvim;
+  package = "cloak-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/codesnap.nix b/plugins/utils/codesnap.nix
index 09238141..d64a9de0 100644
--- a/plugins/utils/codesnap.nix
+++ b/plugins/utils/codesnap.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "codesnap";
   originalName = "codesnap.nvim";
-  defaultPackage = pkgs.vimPlugins.codesnap-nvim;
+  package = "codesnap-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/comment-box.nix b/plugins/utils/comment-box.nix
index 68637a1d..00cd9f16 100644
--- a/plugins/utils/comment-box.nix
+++ b/plugins/utils/comment-box.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -9,7 +8,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "comment-box";
   originalName = "comment-box.nvim";
-  defaultPackage = pkgs.vimPlugins.comment-box-nvim;
+  package = "comment-box-nvim";
   description = ''
     Clarify and beautify your comments and plain text files using boxes and lines.
   '';
diff --git a/plugins/utils/comment.nix b/plugins/utils/comment.nix
index b9089c66..4d7fe5e5 100644
--- a/plugins/utils/comment.nix
+++ b/plugins/utils/comment.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "comment";
   originalName = "Comment.nvim";
   luaName = "Comment";
-  defaultPackage = pkgs.vimPlugins.comment-nvim;
+  package = "comment-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/competitest.nix b/plugins/utils/competitest.nix
index 88395042..1e4e0f99 100644
--- a/plugins/utils/competitest.nix
+++ b/plugins/utils/competitest.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "competitest";
   originalName = "competitest.nvim";
-  defaultPackage = pkgs.vimPlugins.competitest-nvim;
+  package = "competitest-nvim";
 
   maintainers = [ helpers.maintainers.svl ];
 
diff --git a/plugins/utils/dashboard.nix b/plugins/utils/dashboard.nix
index 1b00c0fb..ad3d5725 100644
--- a/plugins/utils/dashboard.nix
+++ b/plugins/utils/dashboard.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "dashboard";
   originalName = "dashboard-nvim";
-  defaultPackage = pkgs.vimPlugins.dashboard-nvim;
+  package = "dashboard-nvim";
 
   maintainers = [ maintainers.MattSturgeon ];
 
diff --git a/plugins/utils/direnv.nix b/plugins/utils/direnv.nix
index 0a469f6a..ee9570a5 100644
--- a/plugins/utils/direnv.nix
+++ b/plugins/utils/direnv.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "direnv";
   originalName = "direnv.vim";
-  defaultPackage = pkgs.vimPlugins.direnv-vim;
+  package = "direnv-vim";
   globalPrefix = "direnv_";
   extraPackages = [ pkgs.direnv ];
 
diff --git a/plugins/utils/dressing.nix b/plugins/utils/dressing.nix
index 44b9df20..51c76d00 100644
--- a/plugins/utils/dressing.nix
+++ b/plugins/utils/dressing.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "dressing";
   originalName = "dressing.nvim";
-  defaultPackage = pkgs.vimPlugins.dressing-nvim;
+  package = "dressing-nvim";
 
   maintainers = [ helpers.maintainers.AndresBermeoMarinelli ];
 
diff --git a/plugins/utils/emmet.nix b/plugins/utils/emmet.nix
index 11917dd4..55fff3dd 100644
--- a/plugins/utils/emmet.nix
+++ b/plugins/utils/emmet.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "emmet";
   originalName = "emmet-vim";
-  defaultPackage = pkgs.vimPlugins.emmet-vim;
+  package = "emmet-vim";
   globalPrefix = "user_emmet_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/endwise.nix b/plugins/utils/endwise.nix
index c5adc9af..14addde9 100644
--- a/plugins/utils/endwise.nix
+++ b/plugins/utils/endwise.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   helpers,
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "endwise";
   originalName = "vim-endwise";
-  defaultPackage = pkgs.vimPlugins.vim-endwise;
+  package = "vim-endwise";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/firenvim.nix b/plugins/utils/firenvim.nix
index 087a866e..b1f719f5 100644
--- a/plugins/utils/firenvim.nix
+++ b/plugins/utils/firenvim.nix
@@ -2,7 +2,6 @@
   lib,
   config,
   options,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,6 @@ let
 in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "firenvim";
-  defaultPackage = pkgs.vimPlugins.firenvim;
 
   maintainers = with lib.maintainers; [ GaetanLepage ];
 
diff --git a/plugins/utils/flash.nix b/plugins/utils/flash.nix
index 76778663..ccf2021f 100644
--- a/plugins/utils/flash.nix
+++ b/plugins/utils/flash.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "flash";
   originalName = "flash.nvim";
-  defaultPackage = pkgs.vimPlugins.flash-nvim;
+  package = "flash-nvim";
 
   maintainers = with maintainers; [
     traxys
diff --git a/plugins/utils/fzf-lua.nix b/plugins/utils/fzf-lua.nix
index 5b23db1b..fac9ef3d 100644
--- a/plugins/utils/fzf-lua.nix
+++ b/plugins/utils/fzf-lua.nix
@@ -32,7 +32,6 @@ let
 in
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "fzf-lua";
-  defaultPackage = pkgs.vimPlugins.fzf-lua;
 
   extraPackages = [ pkgs.fzf ];
 
diff --git a/plugins/utils/goyo.nix b/plugins/utils/goyo.nix
index b8393c42..7e297cc8 100644
--- a/plugins/utils/goyo.nix
+++ b/plugins/utils/goyo.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with helpers.vim-plugin;
@@ -9,7 +8,7 @@ with lib;
 mkVimPlugin {
   name = "goyo";
   originalName = "goyo.vim";
-  defaultPackage = pkgs.vimPlugins.goyo-vim;
+  package = "goyo-vim";
   globalPrefix = "goyo_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/guess-indent.nix b/plugins/utils/guess-indent.nix
index 999eeb42..ee7354c7 100644
--- a/plugins/utils/guess-indent.nix
+++ b/plugins/utils/guess-indent.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "guess-indent";
   originalName = "guess-indent.nvim";
-  defaultPackage = pkgs.vimPlugins.guess-indent-nvim;
+  package = "guess-indent-nvim";
 
   maintainers = [ helpers.maintainers.GGORG ];
 
diff --git a/plugins/utils/hop.nix b/plugins/utils/hop.nix
index 56d5fda8..0e7aff1b 100644
--- a/plugins/utils/hop.nix
+++ b/plugins/utils/hop.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "hop";
   originalName = "hop.nvim";
-  defaultPackage = pkgs.vimPlugins.hop-nvim;
+  package = "hop-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/hydra/default.nix b/plugins/utils/hydra/default.nix
index ef524057..7a4a04b8 100644
--- a/plugins/utils/hydra/default.nix
+++ b/plugins/utils/hydra/default.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "hydra";
   originalName = "hydra.nvim";
-  defaultPackage = pkgs.vimPlugins.hydra-nvim;
+  package = "hydra-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/improved-search.nix b/plugins/utils/improved-search.nix
index 32472422..670c3103 100644
--- a/plugins/utils/improved-search.nix
+++ b/plugins/utils/improved-search.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -10,7 +9,7 @@ with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "improved-search";
   originalName = "improved-search.nvim";
-  defaultPackage = pkgs.vimPlugins.improved-search-nvim;
+  package = "improved-search-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/indent-blankline.nix b/plugins/utils/indent-blankline.nix
index 227cc7ba..75a9b753 100644
--- a/plugins/utils/indent-blankline.nix
+++ b/plugins/utils/indent-blankline.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "indent-blankline";
   originalName = "indent-blankline.nvim";
   luaName = "ibl";
-  defaultPackage = pkgs.vimPlugins.indent-blankline-nvim;
+  package = "indent-blankline-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/indent-o-matic.nix b/plugins/utils/indent-o-matic.nix
index 9ff6efbd..8acc3236 100644
--- a/plugins/utils/indent-o-matic.nix
+++ b/plugins/utils/indent-o-matic.nix
@@ -1,13 +1,11 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "indent-o-matic";
-  defaultPackage = pkgs.vimPlugins.indent-o-matic;
   maintainers = [ helpers.maintainers.alisonjenkins ];
   settingsOptions = {
     max_lines =
diff --git a/plugins/utils/instant.nix b/plugins/utils/instant.nix
index c137e150..3813a42e 100644
--- a/plugins/utils/instant.nix
+++ b/plugins/utils/instant.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "instant";
   originalName = "instant.nvim";
-  defaultPackage = pkgs.vimPlugins.instant-nvim;
+  package = "instant-nvim";
   globalPrefix = "instant_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/magma-nvim.nix b/plugins/utils/magma-nvim.nix
index 1533588c..d0493116 100644
--- a/plugins/utils/magma-nvim.nix
+++ b/plugins/utils/magma-nvim.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "magma-nvim";
   originalName = "magma-nvim";
-  defaultPackage = pkgs.vimPlugins.magma-nvim-goose;
+  package = "magma-nvim-goose";
   globalPrefix = "magma_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/molten.nix b/plugins/utils/molten.nix
index d02a08c2..e7bc4da2 100644
--- a/plugins/utils/molten.nix
+++ b/plugins/utils/molten.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "molten";
   originalName = "molten-nvim";
-  defaultPackage = pkgs.vimPlugins.molten-nvim;
+  package = "molten-nvim";
   globalPrefix = "molten_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/neoclip.nix b/plugins/utils/neoclip.nix
index 848bbd56..d670905d 100644
--- a/plugins/utils/neoclip.nix
+++ b/plugins/utils/neoclip.nix
@@ -8,7 +8,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "neoclip";
   originalName = "nvim-neoclip.lua";
-  defaultPackage = pkgs.vimPlugins.nvim-neoclip-lua;
+  package = "nvim-neoclip-lua";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/neocord.nix b/plugins/utils/neocord.nix
index 4fcd89b4..fa0ee353 100644
--- a/plugins/utils/neocord.nix
+++ b/plugins/utils/neocord.nix
@@ -1,13 +1,11 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "neocord";
-  defaultPackage = pkgs.vimPlugins.neocord;
 
   maintainers = [ ];
 
diff --git a/plugins/utils/nvim-autopairs.nix b/plugins/utils/nvim-autopairs.nix
index 9345af3f..efee0fb3 100644
--- a/plugins/utils/nvim-autopairs.nix
+++ b/plugins/utils/nvim-autopairs.nix
@@ -2,13 +2,11 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "nvim-autopairs";
-  defaultPackage = pkgs.vimPlugins.nvim-autopairs;
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/obsidian/default.nix b/plugins/utils/obsidian/default.nix
index 53113735..57b89d2f 100644
--- a/plugins/utils/obsidian/default.nix
+++ b/plugins/utils/obsidian/default.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "obsidian";
   originalName = "obsidian.nvim";
-  defaultPackage = pkgs.vimPlugins.obsidian-nvim;
+  package = "obsidian-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/oil.nix b/plugins/utils/oil.nix
index 1d219f8a..44a0cdb6 100644
--- a/plugins/utils/oil.nix
+++ b/plugins/utils/oil.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "oil";
   originalName = "oil.nvim";
-  defaultPackage = pkgs.vimPlugins.oil-nvim;
+  package = "oil-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/project-nvim.nix b/plugins/utils/project-nvim.nix
index 11950aea..33cf4603 100644
--- a/plugins/utils/project-nvim.nix
+++ b/plugins/utils/project-nvim.nix
@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }:
 let
@@ -11,7 +10,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "project-nvim";
   originalName = "project.nvim";
   luaName = "project_nvim";
-  defaultPackage = pkgs.vimPlugins.project-nvim;
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/utils/refactoring.nix b/plugins/utils/refactoring.nix
index aebdf9fb..cff566f7 100644
--- a/plugins/utils/refactoring.nix
+++ b/plugins/utils/refactoring.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "refactoring";
   originalName = "refactoring.nvim";
-  defaultPackage = pkgs.vimPlugins.refactoring-nvim;
+  package = "refactoring-nvim";
 
   maintainers = [ maintainers.MattSturgeon ];
 
diff --git a/plugins/utils/rest.nix b/plugins/utils/rest.nix
index a879c3ce..604edbf5 100644
--- a/plugins/utils/rest.nix
+++ b/plugins/utils/rest.nix
@@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
   name = "rest";
   originalName = "rest.nvim";
   luaName = "rest-nvim";
-  defaultPackage = pkgs.vimPlugins.rest-nvim;
+  package = "rest-nvim";
 
   extraPackages = [ pkgs.curl ];
 
diff --git a/plugins/utils/sandwich.nix b/plugins/utils/sandwich.nix
index c247db57..2ad1841c 100644
--- a/plugins/utils/sandwich.nix
+++ b/plugins/utils/sandwich.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "sandwich";
   originalName = "vim-sandwich";
-  defaultPackage = pkgs.vimPlugins.vim-sandwich;
+  package = "vim-sandwich";
   globalPrefix = "sandwich_";
 
   description = ''
diff --git a/plugins/utils/scope.nix b/plugins/utils/scope.nix
index b3a8de1c..6ab4e4ef 100644
--- a/plugins/utils/scope.nix
+++ b/plugins/utils/scope.nix
@@ -1,12 +1,11 @@
 {
   lib,
-  pkgs,
   ...
 }:
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "scope";
   originalName = "scope.nvim";
-  defaultPackage = pkgs.vimPlugins.scope-nvim;
+  package = "scope-nvim";
 
   maintainers = [ lib.maintainers.insipx ];
 
diff --git a/plugins/utils/sleuth.nix b/plugins/utils/sleuth.nix
index 8765783e..0d3974a8 100644
--- a/plugins/utils/sleuth.nix
+++ b/plugins/utils/sleuth.nix
@@ -1,13 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "sleuth";
   originalName = "vim-sleuth";
-  defaultPackage = pkgs.vimPlugins.vim-sleuth;
+  package = "vim-sleuth";
   globalPrefix = "sleuth_";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
diff --git a/plugins/utils/smart-splits.nix b/plugins/utils/smart-splits.nix
index afce5143..5efa3e6a 100644
--- a/plugins/utils/smart-splits.nix
+++ b/plugins/utils/smart-splits.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
   helpers,
   ...
 }:
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "smart-splits";
   originalName = "smart-splits.nvim";
-  defaultPackage = pkgs.vimPlugins.smart-splits-nvim;
+  package = "smart-splits-nvim";
 
   maintainers = [ lib.maintainers.foo-dogsquared ];
 
diff --git a/plugins/utils/spectre.nix b/plugins/utils/spectre.nix
index 02b6b3eb..c7b4cabd 100644
--- a/plugins/utils/spectre.nix
+++ b/plugins/utils/spectre.nix
@@ -9,7 +9,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "spectre";
   originalName = "nvim-spectre";
-  defaultPackage = pkgs.vimPlugins.nvim-spectre;
+  package = "nvim-spectre";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/startify/default.nix b/plugins/utils/startify/default.nix
index ccb0de4c..df1010eb 100644
--- a/plugins/utils/startify/default.nix
+++ b/plugins/utils/startify/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +8,7 @@ with helpers.vim-plugin;
 mkVimPlugin {
   name = "startify";
   originalName = "vim-startify";
-  defaultPackage = pkgs.vimPlugins.vim-startify;
+  package = "vim-startify";
   globalPrefix = "startify_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/surround.nix b/plugins/utils/surround.nix
index 14879277..0bd53eb7 100644
--- a/plugins/utils/surround.nix
+++ b/plugins/utils/surround.nix
@@ -1,13 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "surround";
   originalName = "surround.vim";
-  defaultPackage = pkgs.vimPlugins.vim-surround;
+  package = "vim-surround";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 }
diff --git a/plugins/utils/tmux-navigator.nix b/plugins/utils/tmux-navigator.nix
index 1ae542ed..d795564d 100644
--- a/plugins/utils/tmux-navigator.nix
+++ b/plugins/utils/tmux-navigator.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "tmux-navigator";
   originalName = "vim-tmux-navigator";
-  defaultPackage = pkgs.vimPlugins.vim-tmux-navigator;
+  package = "vim-tmux-navigator";
   globalPrefix = "tmux_navigator_";
 
   maintainers = [ maintainers.MattSturgeon ];
diff --git a/plugins/utils/todo-comments.nix b/plugins/utils/todo-comments.nix
index e0e85a6e..5e2fd00d 100644
--- a/plugins/utils/todo-comments.nix
+++ b/plugins/utils/todo-comments.nix
@@ -19,7 +19,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "todo-comments";
   originalName = "todo-comments.nvim";
-  defaultPackage = pkgs.vimPlugins.todo-comments-nvim;
+  package = "todo-comments-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/utils/toggleterm.nix b/plugins/utils/toggleterm.nix
index 2d62520a..b4669e58 100644
--- a/plugins/utils/toggleterm.nix
+++ b/plugins/utils/toggleterm.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "toggleterm";
   originalName = "toggleterm.nvim";
-  defaultPackage = pkgs.vimPlugins.toggleterm-nvim;
+  package = "toggleterm-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/trim.nix b/plugins/utils/trim.nix
index ac6eaf48..81cdc4a1 100644
--- a/plugins/utils/trim.nix
+++ b/plugins/utils/trim.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "trim";
   originalName = "trim.nvim";
-  defaultPackage = pkgs.vimPlugins.trim-nvim;
+  package = "trim-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/undotree.nix b/plugins/utils/undotree.nix
index 2f4501a8..74cf7cdb 100644
--- a/plugins/utils/undotree.nix
+++ b/plugins/utils/undotree.nix
@@ -1,14 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
 mkVimPlugin {
   name = "undotree";
-  defaultPackage = pkgs.vimPlugins.undotree;
   globalPrefix = "undotree_";
 
   maintainers = [ maintainers.GaetanLepage ];
diff --git a/plugins/utils/vim-css-color.nix b/plugins/utils/vim-css-color.nix
index 95a6639b..323596ac 100644
--- a/plugins/utils/vim-css-color.nix
+++ b/plugins/utils/vim-css-color.nix
@@ -1,11 +1,8 @@
 {
   helpers,
-  pkgs,
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "vim-css-color";
-  defaultPackage = pkgs.vimPlugins.vim-css-color;
-
   maintainers = [ helpers.maintainers.DanielLaing ];
 }
diff --git a/plugins/utils/wakatime.nix b/plugins/utils/wakatime.nix
index 449dafb8..12c8518a 100644
--- a/plugins/utils/wakatime.nix
+++ b/plugins/utils/wakatime.nix
@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
 helpers.vim-plugin.mkVimPlugin {
   name = "wakatime";
   originalName = "vim-wakatime";
-  defaultPackage = pkgs.vimPlugins.vim-wakatime;
+  package = "vim-wakatime";
 
   maintainers = [ maintainers.GaetanLepage ];
 }
diff --git a/plugins/utils/which-key.nix b/plugins/utils/which-key.nix
index 60022d05..db3ee803 100644
--- a/plugins/utils/which-key.nix
+++ b/plugins/utils/which-key.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   options,
   ...
 }:
@@ -79,7 +78,7 @@ in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "which-key";
   originalName = "which-key.nvim";
-  defaultPackage = pkgs.vimPlugins.which-key-nvim;
+  package = "which-key-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
diff --git a/plugins/utils/yanky.nix b/plugins/utils/yanky.nix
index d0f33651..b9c69c6f 100644
--- a/plugins/utils/yanky.nix
+++ b/plugins/utils/yanky.nix
@@ -9,7 +9,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "yanky";
   originalName = "yanky.nvim";
-  defaultPackage = pkgs.vimPlugins.yanky-nvim;
+  package = "yanky-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];
 
diff --git a/plugins/utils/zellij.nix b/plugins/utils/zellij.nix
index d88e8859..e81ce4f1 100644
--- a/plugins/utils/zellij.nix
+++ b/plugins/utils/zellij.nix
@@ -1,13 +1,12 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "zellij";
   originalName = "zellij.nvim";
-  defaultPackage = pkgs.vimPlugins.zellij-nvim;
+  package = "zellij-nvim";
 
   maintainers = [ lib.maintainers.hmajid2301 ];
 
diff --git a/plugins/utils/zk.nix b/plugins/utils/zk.nix
index 8414f429..92965712 100644
--- a/plugins/utils/zk.nix
+++ b/plugins/utils/zk.nix
@@ -9,7 +9,7 @@ with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "zk";
   originalName = "zk.nvim";
-  defaultPackage = pkgs.vimPlugins.zk-nvim;
+  package = "zk-nvim";
 
   maintainers = [ maintainers.GaetanLepage ];