plugins: migrate defaultPackage -> package

Migrate all users of `mkVimPlugin` and `mkNeovimPlugin` to use the new
`package` argument instead of the old `defaultPackage` argument.

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.",

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 ? "",

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 ];
 

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 ];
 

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 ];
 

plugins/bufferlines/barbecue.nix

@@ -1,15 +1,11 @@
-{
+{ lib, ... }:
-  lib,
-  pkgs,
-  ...
-}:
 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 ];
 

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 ];
 

plugins/bufferlines/navic.nix

@@ -1,8 +1,4 @@
-{
+{ lib, ... }:
-  lib,
-  pkgs,
-  ...
-}:
 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 ];
 

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;

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; [

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 ];
 

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 ];
 

plugins/colorschemes/dracula-nvim.nix

@@ -1,14 +1,9 @@
-{
+{ lib, ... }:
-  lib,
-  pkgs,
-  ...
-}:
 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 ];

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 ];

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 ];
 

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:

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 ];
 

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 ];

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 ];
 

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 ];

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 ];

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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;
 

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 ];
 

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 ];

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 ];

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

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 ];
 

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 ];

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];

plugins/git/neogit/default.nix

@@ -8,7 +8,6 @@
 with lib;
 helpers.neovim-plugin.mkNeovimPlugin {
   name = "neogit";
-  defaultPackage = pkgs.vimPlugins.neogit;
 
   maintainers = [ maintainers.GaetanLepage ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];

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 ];
 

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 ];

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 ];

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 ];
 

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 ];
 

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 ];

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 ];
 

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;
 

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 ];
 }

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 ];
 

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 ];
 

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 ];

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 ];
 

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 ];
 

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 ];
 

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; [

plugins/languages/tagbar.nix

@@ -6,7 +6,6 @@
 }:
 helpers.vim-plugin.mkVimPlugin {
   name = "tagbar";
-  defaultPackage = pkgs.vimPlugins.tagbar;
   globalPrefix = "tagbar_";
   extraPackages = [ pkgs.ctags ];
 

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 ];
 

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 ];
 

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]

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 ];
 

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

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 ];

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 ];

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 ];

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 ];
 

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;

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 =

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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`.

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 ];
 

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 ];

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 ];
 

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 = {

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 ];
 

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 ];
 

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 ];

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 ];
 

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 ];