lib/options: rename mkPackageOption to mkPluginPackageOption

lib/neovim-plugin.nix

@@ -95,7 +95,7 @@ rec {
       options.${namespace}.${name} = {
         enable = mkEnableOption originalName;
 
-        package = nixvimOptions.mkPackageOption originalName defaultPackage;
+        package = nixvimOptions.mkPluginPackageOption originalName defaultPackage;
 
         settings = mkSettingsOption {
           pluginName = name;

lib/options.nix

@@ -155,12 +155,12 @@ rec {
       mkNullable nixvimTypes.highlight default (if desc == "" then "Highlight settings." else desc);
   };
 
-  mkPackageOption =
+  mkPluginPackageOption =
     name: default:
     mkOption {
       type = types.package;
       inherit default;
-      description = "Plugin to use for ${name}";
+      description = "Which package to use for the ${name} plugin.";
     };
 
   mkSettingsOption =

lib/vim-plugin.nix

@@ -43,7 +43,7 @@ with lib;
         if defaultPackage == null then
           { }
         else
-          { package = nixvimOptions.mkPackageOption name defaultPackage; };
+          { package = nixvimOptions.mkPluginPackageOption name defaultPackage; };
 
       createSettingsOption = (isString globalPrefix) && (globalPrefix != "");
 

plugins/bufferlines/barbar.nix

@@ -83,7 +83,7 @@ in
   options.plugins.barbar = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "barbar.nvim";
 
-    package = helpers.mkPackageOption "barbar" pkgs.vimPlugins.barbar-nvim;
+    package = helpers.mkPluginPackageOption "barbar" pkgs.vimPlugins.barbar-nvim;
 
     animation = helpers.defaultNullOpts.mkBool true "Enable/disable animations";
 

plugins/bufferlines/barbecue.nix

@@ -14,7 +14,7 @@ in
   options.plugins.barbecue = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "barbecue-nvim";
 
-    package = helpers.mkPackageOption "barbecue-nvim" pkgs.vimPlugins.barbecue-nvim;
+    package = helpers.mkPluginPackageOption "barbecue-nvim" pkgs.vimPlugins.barbecue-nvim;
 
     attachNavic = helpers.defaultNullOpts.mkBool true ''
       Whether to attach navic to language servers automatically.

plugins/bufferlines/bufferline.nix

@@ -95,7 +95,7 @@ in
     plugins.bufferline = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "bufferline";
 
-      package = helpers.mkPackageOption "bufferline" pkgs.vimPlugins.bufferline-nvim;
+      package = helpers.mkPluginPackageOption "bufferline" pkgs.vimPlugins.bufferline-nvim;
 
       mode = helpers.defaultNullOpts.mkEnumFirstDefault [
         "buffers"

plugins/bufferlines/navic.nix

@@ -13,7 +13,7 @@ in
   options.plugins.navic = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-navic";
 
-    package = helpers.mkPackageOption "nvim-navic" pkgs.vimPlugins.nvim-navic;
+    package = helpers.mkPluginPackageOption "nvim-navic" pkgs.vimPlugins.nvim-navic;
 
     icons = mapAttrs (name: default: helpers.defaultNullOpts.mkStr default "icon for ${name}.") {
       File = "󰈙 ";

plugins/colorschemes/dracula.nix

@@ -14,7 +14,7 @@ in
     colorschemes.dracula = {
       enable = mkEnableOption "dracula";
 
-      package = helpers.mkPackageOption "dracula" pkgs.vimPlugins.dracula-vim;
+      package = helpers.mkPluginPackageOption "dracula" pkgs.vimPlugins.dracula-vim;
 
       bold = mkOption {
         type = types.bool;

plugins/completion/cmp/sources/codeium-nvim.nix

@@ -13,7 +13,7 @@ in
   meta.maintainers = [ maintainers.GaetanLepage ];
 
   options.plugins.codeium-nvim = helpers.neovim-plugin.extraOptionsOptions // {
-    package = helpers.mkPackageOption "codeium.nvim" pkgs.vimPlugins.codeium-nvim;
+    package = helpers.mkPluginPackageOption "codeium.nvim" pkgs.vimPlugins.codeium-nvim;
 
     configPath = helpers.defaultNullOpts.mkStr ''{__raw = "vim.fn.stdpath('cache') .. '/codeium/config.json'";}'' "The path to the config file, used to store the API key.";
 

plugins/completion/copilot-lua.nix

@@ -19,7 +19,7 @@ in
       // {
         enable = mkEnableOption "copilot.lua";
 
-        package = helpers.mkPackageOption "copilot.lua" pkgs.vimPlugins.copilot-lua;
+        package = helpers.mkPluginPackageOption "copilot.lua" pkgs.vimPlugins.copilot-lua;
 
         panel = {
           enabled = helpers.defaultNullOpts.mkBool true "Enable the panel.";

plugins/completion/coq-thirdparty.nix

@@ -13,7 +13,7 @@ in
   options.plugins.coq-thirdparty = {
     enable = mkEnableOption "coq-thirdparty";
 
-    package = helpers.mkPackageOption "coq-thirdparty" pkgs.vimPlugins.coq-thirdparty;
+    package = helpers.mkPluginPackageOption "coq-thirdparty" pkgs.vimPlugins.coq-thirdparty;
 
     sources = mkOption {
       type = types.listOf (

plugins/completion/lspkind.nix

@@ -13,7 +13,7 @@ in
   options.plugins.lspkind = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lspkind.nvim";
 
-    package = helpers.mkPackageOption "lspkind" pkgs.vimPlugins.lspkind-nvim;
+    package = helpers.mkPluginPackageOption "lspkind" pkgs.vimPlugins.lspkind-nvim;
 
     mode = helpers.defaultNullOpts.mkEnum [
       "text"

plugins/dap/dap-go.nix

@@ -14,7 +14,7 @@ in
   options.plugins.dap.extensions.dap-go = {
     enable = mkEnableOption "dap-go";
 
-    package = helpers.mkPackageOption "dap-go" pkgs.vimPlugins.nvim-dap-go;
+    package = helpers.mkPluginPackageOption "dap-go" pkgs.vimPlugins.nvim-dap-go;
 
     dapConfigurations = helpers.mkNullOrOption (types.listOf dapHelpers.configurationOption) ''
       Additional dap configurations.

plugins/dap/dap-python.nix

@@ -14,7 +14,7 @@ in
   options.plugins.dap.extensions.dap-python = {
     enable = mkEnableOption "dap-python";
 
-    package = helpers.mkPackageOption "dap-python" pkgs.vimPlugins.nvim-dap-python;
+    package = helpers.mkPluginPackageOption "dap-python" pkgs.vimPlugins.nvim-dap-python;
 
     adapterPythonPath = mkOption {
       default = "${pkgs.python3.withPackages (ps: with ps; [ debugpy ])}/bin/python3";

plugins/dap/dap-ui.nix

@@ -59,7 +59,7 @@ in
   options.plugins.dap.extensions.dap-ui = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "dap-ui";
 
-    package = helpers.mkPackageOption "dap-ui" pkgs.vimPlugins.nvim-dap-ui;
+    package = helpers.mkPluginPackageOption "dap-ui" pkgs.vimPlugins.nvim-dap-ui;
 
     controls = {
       enabled = helpers.defaultNullOpts.mkBool true "Enable controls";

plugins/dap/dap-virtual-text.nix

@@ -13,7 +13,7 @@ in
   options.plugins.dap.extensions.dap-virtual-text = {
     enable = mkEnableOption "dap-virtual-text";
 
-    package = helpers.mkPackageOption "dap-virtual-text" pkgs.vimPlugins.nvim-dap-virtual-text;
+    package = helpers.mkPluginPackageOption "dap-virtual-text" pkgs.vimPlugins.nvim-dap-virtual-text;
 
     enabledCommands = helpers.defaultNullOpts.mkBool true ''
       Create commands `DapVirtualTextEnable`, `DapVirtualTextDisable`, `DapVirtualTextToggle`.

plugins/dap/default.nix

@@ -22,7 +22,7 @@ with dapHelpers;
   options.plugins.dap = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "dap";
 
-    package = helpers.mkPackageOption "dap" pkgs.vimPlugins.nvim-dap;
+    package = helpers.mkPluginPackageOption "dap" pkgs.vimPlugins.nvim-dap;
 
     adapters = helpers.mkCompositeOption "Dap adapters." {
       executables = mkAdapterOption "executable" executableAdapterOption;

plugins/filetrees/chadtree.nix

@@ -14,7 +14,7 @@ in
   options.plugins.chadtree = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "chadtree";
 
-    package = helpers.mkPackageOption "chadtree" pkgs.vimPlugins.chadtree;
+    package = helpers.mkPluginPackageOption "chadtree" pkgs.vimPlugins.chadtree;
 
     options = {
       follow = helpers.defaultNullOpts.mkBool true ''

plugins/filetrees/neo-tree.nix

@@ -55,7 +55,7 @@ in
     // {
       enable = mkEnableOption "neo-tree";
 
-      package = helpers.mkPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim;
+      package = helpers.mkPluginPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim;
 
       sources =
         helpers.defaultNullOpts.mkNullable (types.listOf types.str)

plugins/filetrees/nvim-tree.nix

@@ -43,7 +43,7 @@ in
   options.plugins.nvim-tree = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-tree";
 
-    package = helpers.mkPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
+    package = helpers.mkPluginPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
 
     disableNetrw = helpers.defaultNullOpts.mkBool false "Disable netrw";
 

plugins/git/diffview.nix

@@ -79,7 +79,7 @@ in
     // {
       enable = mkEnableOption "diffview";
 
-      package = helpers.mkPackageOption "diffview" pkgs.vimPlugins.diffview-nvim;
+      package = helpers.mkPluginPackageOption "diffview" pkgs.vimPlugins.diffview-nvim;
 
       diffBinaries = mkBool false ''
         Show diffs for binaries

plugins/git/git-worktree.nix

@@ -14,7 +14,7 @@ in
     plugins.git-worktree = {
       enable = mkEnableOption "git-worktree";
 
-      package = helpers.mkPackageOption "git-worktree" pkgs.vimPlugins.git-worktree-nvim;
+      package = helpers.mkPluginPackageOption "git-worktree" pkgs.vimPlugins.git-worktree-nvim;
 
       enableTelescope = mkEnableOption "telescope integration";
 

plugins/git/gitblame.nix

@@ -14,7 +14,7 @@ in
     plugins.gitblame = {
       enable = mkEnableOption "gitblame";
 
-      package = helpers.mkPackageOption "gitblame" pkgs.vimPlugins.git-blame-nvim;
+      package = helpers.mkPluginPackageOption "gitblame" pkgs.vimPlugins.git-blame-nvim;
 
       messageTemplate = helpers.defaultNullOpts.mkStr "  <author> • <date> • <summary>" "The template for the blame message that will be shown.";
 

plugins/git/gitgutter.nix

@@ -14,7 +14,7 @@ in
     plugins.gitgutter = {
       enable = mkEnableOption "gitgutter";
 
-      package = helpers.mkPackageOption "gitgutter" pkgs.vimPlugins.gitgutter;
+      package = helpers.mkPluginPackageOption "gitgutter" pkgs.vimPlugins.gitgutter;
 
       recommendedSettings = mkOption {
         type = types.bool;

plugins/git/gitlinker.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.gitlinker = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "gitlinker.nvim";
 
-    package = helpers.mkPackageOption "gitlinker.nvim" pkgs.vimPlugins.gitlinker-nvim;
+    package = helpers.mkPluginPackageOption "gitlinker.nvim" pkgs.vimPlugins.gitlinker-nvim;
 
     remote = helpers.mkNullOrOption types.str "Force the use of a specific remote.";
 

plugins/git/gitmessenger.nix

@@ -12,7 +12,7 @@ with lib;
   options.plugins.gitmessenger = {
     enable = mkEnableOption "gitmessenger";
 
-    package = helpers.mkPackageOption "git-messenger" pkgs.vimPlugins.git-messenger-vim;
+    package = helpers.mkPluginPackageOption "git-messenger" pkgs.vimPlugins.git-messenger-vim;
 
     closeOnCursorMoved = helpers.defaultNullOpts.mkBool true ''
       A popup window is no longer closed automatically when moving a cursor after the window is

plugins/languages/clangd-extensions.nix

@@ -98,7 +98,7 @@ in
   options.plugins.clangd-extensions = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "clangd_extensions, plugins implementing clangd LSP extensions";
 
-    package = helpers.mkPackageOption "clangd_extensions.nvim" pkgs.vimPlugins.clangd_extensions-nvim;
+    package = helpers.mkPluginPackageOption "clangd_extensions.nvim" pkgs.vimPlugins.clangd_extensions-nvim;
 
     enableOffsetEncodingWorkaround = mkEnableOption ''
       utf-16 offset encoding. This is used to work around the warning:

plugins/languages/helm.nix

@@ -15,7 +15,7 @@ in
   options.plugins.helm = {
     enable = mkEnableOption "vim-helm";
 
-    package = helpers.mkPackageOption "vim-helm" pkgs.vimPlugins.vim-helm;
+    package = helpers.mkPluginPackageOption "vim-helm" pkgs.vimPlugins.vim-helm;
   };
 
   config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

plugins/languages/lean.nix

@@ -13,7 +13,7 @@ in
   options.plugins.lean = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lean-nvim";
 
-    package = helpers.mkPackageOption "lean-nvim" pkgs.vimPlugins.lean-nvim;
+    package = helpers.mkPluginPackageOption "lean-nvim" pkgs.vimPlugins.lean-nvim;
 
     leanPackage = mkOption {
       type = with types; nullOr package;

plugins/languages/lint.nix

@@ -137,7 +137,7 @@ in
   options.plugins.lint = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-lint";
 
-    package = helpers.mkPackageOption "nvim-lint" pkgs.vimPlugins.nvim-lint;
+    package = helpers.mkPluginPackageOption "nvim-lint" pkgs.vimPlugins.nvim-lint;
 
     lintersByFt = mkOption {
       type = with types; attrsOf (listOf str);

plugins/languages/nvim-jdtls.nix

@@ -13,7 +13,7 @@ in
   options.plugins.nvim-jdtls = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-jdtls";
 
-    package = helpers.mkPackageOption "nvim-jdtls" pkgs.vimPlugins.nvim-jdtls;
+    package = helpers.mkPluginPackageOption "nvim-jdtls" pkgs.vimPlugins.nvim-jdtls;
 
     cmd = helpers.mkNullOrOption (types.listOf types.str) ''
       The command that starts the language server.

plugins/languages/openscad.nix

@@ -13,7 +13,7 @@ in
   options.plugins.openscad = {
     enable = mkEnableOption "openscad.nvim, a plugin to manage OpenSCAD files";
 
-    package = helpers.mkPackageOption "openscad.nvim" pkgs.vimPlugins.openscad-nvim;
+    package = helpers.mkPluginPackageOption "openscad.nvim" pkgs.vimPlugins.openscad-nvim;
 
     fuzzyFinder = helpers.defaultNullOpts.mkEnum [
       "skim"

plugins/languages/plantuml-syntax.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.plantuml-syntax = {
     enable = mkEnableOption "plantuml syntax support";
 
-    package = helpers.mkPackageOption "plantuml-syntax" pkgs.vimPlugins.plantuml-syntax;
+    package = helpers.mkPluginPackageOption "plantuml-syntax" pkgs.vimPlugins.plantuml-syntax;
 
     setMakeprg = mkOption {
       type = types.bool;

plugins/languages/rust-tools.nix

@@ -12,7 +12,7 @@ in
 {
   options.plugins.rust-tools = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rust tools plugins";
-    package = helpers.mkPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
+    package = helpers.mkPluginPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
     serverPackage = mkOption {
       type = with types; nullOr package;
       default = pkgs.rust-analyzer;

plugins/languages/rustaceanvim.nix

@@ -15,7 +15,7 @@ in
   options.plugins.rustaceanvim = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rustaceanvim";
 
-    package = helpers.mkPackageOption "rustaceanvim" pkgs.vimPlugins.rustaceanvim;
+    package = helpers.mkPluginPackageOption "rustaceanvim" pkgs.vimPlugins.rustaceanvim;
 
     rustAnalyzerPackage = mkOption {
       type = with types; nullOr package;

plugins/languages/sniprun.nix

@@ -15,7 +15,7 @@ in
   options.plugins.sniprun = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "sniprun";
 
-    package = helpers.mkPackageOption "sniprun" pkgs.vimPlugins.sniprun;
+    package = helpers.mkPluginPackageOption "sniprun" pkgs.vimPlugins.sniprun;
 
     selectedInterpreters = mkList "[]" "use those instead of the default for the current filetype";
 

plugins/languages/treesitter/hmts.nix

@@ -15,7 +15,7 @@ in
   options.plugins.hmts = {
     enable = mkEnableOption "hmts.nvim";
 
-    package = helpers.mkPackageOption "hmts.nvim" pkgs.vimPlugins.hmts-nvim;
+    package = helpers.mkPluginPackageOption "hmts.nvim" pkgs.vimPlugins.hmts-nvim;
   };
 
   config = mkIf cfg.enable {

plugins/languages/treesitter/rainbow-delimiters.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.rainbow-delimiters = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rainbow-delimiters.nvim";
 
-    package = helpers.mkPackageOption "rainbow-delimiters.nvim" pkgs.vimPlugins.rainbow-delimiters-nvim;
+    package = helpers.mkPluginPackageOption "rainbow-delimiters.nvim" pkgs.vimPlugins.rainbow-delimiters-nvim;
 
     strategy =
       helpers.defaultNullOpts.mkNullable

plugins/languages/treesitter/treesitter-refactor.nix

@@ -18,7 +18,7 @@ with lib;
     {
       enable = mkEnableOption "treesitter-refactor (requires plugins.treesitter.enable to be true)";
 
-      package = helpers.mkPackageOption "treesitter-refactor" pkgs.vimPlugins.nvim-treesitter-refactor;
+      package = helpers.mkPluginPackageOption "treesitter-refactor" pkgs.vimPlugins.nvim-treesitter-refactor;
 
       highlightDefinitions = {
         inherit disable;

plugins/languages/treesitter/treesitter-textobjects.nix

@@ -43,7 +43,7 @@ with lib;
     // {
       enable = mkEnableOption "treesitter-textobjects (requires plugins.treesitter.enable to be true)";
 
-      package = helpers.mkPackageOption "treesitter-textobjects" pkgs.vimPlugins.nvim-treesitter-textobjects;
+      package = helpers.mkPluginPackageOption "treesitter-textobjects" pkgs.vimPlugins.nvim-treesitter-textobjects;
 
       select = {
         enable = helpers.defaultNullOpts.mkBool false ''

plugins/languages/treesitter/ts-autotag.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.ts-autotag = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-ts-autotag";
 
-    package = helpers.mkPackageOption "ts-autotag" pkgs.vimPlugins.nvim-ts-autotag;
+    package = helpers.mkPluginPackageOption "ts-autotag" pkgs.vimPlugins.nvim-ts-autotag;
 
     filetypes = helpers.defaultNullOpts.mkNullable (with types; listOf str) ''
       [

plugins/languages/treesitter/ts-context-commentstring.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.ts-context-commentstring = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-ts-context-commentstring";
 
-    package = helpers.mkPackageOption "ts-context-commentstring" pkgs.vimPlugins.nvim-ts-context-commentstring;
+    package = helpers.mkPluginPackageOption "ts-context-commentstring" pkgs.vimPlugins.nvim-ts-context-commentstring;
 
     skipTsContextCommentStringModule = mkOption {
       type = types.bool;

plugins/languages/typescript-tools.nix

@@ -12,7 +12,7 @@ in
 {
   options.plugins.typescript-tools = {
     enable = mkEnableOption "typescript-tools";
-    package = helpers.mkPackageOption "typescript-tools" pkgs.vimPlugins.typescript-tools-nvim;
+    package = helpers.mkPluginPackageOption "typescript-tools" pkgs.vimPlugins.typescript-tools-nvim;
 
     onAttach = helpers.defaultNullOpts.mkLuaFn "__lspOnAttach" "Lua code to run when tsserver attaches to a buffer.";
     handlers = mkOption {

plugins/lsp/conform-nvim.nix

@@ -13,7 +13,7 @@ in
   options.plugins.conform-nvim = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "conform-nvim";
 
-    package = helpers.mkPackageOption "conform-nvim" pkgs.vimPlugins.conform-nvim;
+    package = helpers.mkPluginPackageOption "conform-nvim" pkgs.vimPlugins.conform-nvim;
 
     formattersByFt =
       helpers.defaultNullOpts.mkNullable (types.attrsOf types.anything) "see documentation"

plugins/lsp/fidget.nix

@@ -145,7 +145,7 @@ in
     plugins.fidget = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "fidget-nvim";
 
-      package = helpers.mkPackageOption "fidget-nvim" pkgs.vimPlugins.fidget-nvim;
+      package = helpers.mkPluginPackageOption "fidget-nvim" pkgs.vimPlugins.fidget-nvim;
 
       # Options related to LSP progress subsystem
       progress = {

plugins/lsp/inc-rename.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.inc-rename = {
     enable = mkEnableOption "inc-rename, a plugin previewing LSP renaming";
 
-    package = helpers.mkPackageOption "inc-rename" pkgs.vimPlugins.inc-rename-nvim;
+    package = helpers.mkPluginPackageOption "inc-rename" pkgs.vimPlugins.inc-rename-nvim;
 
     cmdName = helpers.defaultNullOpts.mkStr "IncRename" "the name of the command";
 

plugins/lsp/language-servers/efmls-configs.nix

@@ -128,7 +128,7 @@ in
   options.plugins.efmls-configs = {
     enable = mkEnableOption "efmls-configs, premade configurations for efm-langserver";
 
-    package = helpers.mkPackageOption "efmls-configs-nvim" pkgs.vimPlugins.efmls-configs-nvim;
+    package = helpers.mkPluginPackageOption "efmls-configs-nvim" pkgs.vimPlugins.efmls-configs-nvim;
 
     externallyManagedPackages = mkOption {
       type = types.either (types.enum [ "all" ]) (types.listOf types.str);

plugins/lsp/lsp-format.nix

@@ -13,7 +13,7 @@ in
   options.plugins.lsp-format = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lsp-format.nvim";
 
-    package = helpers.mkPackageOption "lsp-format.nvim" pkgs.vimPlugins.lsp-format-nvim;
+    package = helpers.mkPluginPackageOption "lsp-format.nvim" pkgs.vimPlugins.lsp-format-nvim;
 
     setup = mkOption {
       type =

plugins/lsp/lsp-lines.nix

@@ -14,7 +14,7 @@ in
     plugins.lsp-lines = {
       enable = mkEnableOption "lsp_lines.nvim";
 
-      package = helpers.mkPackageOption "lsp_lines.nvim" pkgs.vimPlugins.lsp_lines-nvim;
+      package = helpers.mkPluginPackageOption "lsp_lines.nvim" pkgs.vimPlugins.lsp_lines-nvim;
 
       currentLine = mkOption {
         type = types.bool;

plugins/lsp/lspsaga.nix

@@ -49,7 +49,7 @@ in
     plugins.lspsaga = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "lspsaga.nvim";
 
-      package = helpers.mkPackageOption "lspsaga" pkgs.vimPlugins.lspsaga-nvim;
+      package = helpers.mkPluginPackageOption "lspsaga" pkgs.vimPlugins.lspsaga-nvim;
 
       ui = {
         border = helpers.defaultNullOpts.mkBorder "single" "lspsaga" "";

plugins/lsp/wtf.nix

@@ -31,7 +31,7 @@ in
     plugins.wtf = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "wtf.nvim";
 
-      package = helpers.mkPackageOption "wtf.nvim" pkgs.vimPlugins.wtf-nvim;
+      package = helpers.mkPluginPackageOption "wtf.nvim" pkgs.vimPlugins.wtf-nvim;
 
       keymaps = mapAttrs (
         action: defaults:

plugins/neotest/adapters.nix

@@ -20,7 +20,7 @@ let
       options.plugins.neotest.adapters.${name} = {
         enable = mkEnableOption name;
 
-        package = helpers.mkPackageOption name pkgs.vimPlugins.${packageName};
+        package = helpers.mkPluginPackageOption name pkgs.vimPlugins.${packageName};
 
         settings = helpers.mkSettingsOption { description = "settings for the `${name}` adapter."; };
       };

plugins/snippets/friendly-snippets.nix

@@ -15,7 +15,7 @@ in
   options.plugins.friendly-snippets = {
     enable = mkEnableOption "friendly-snippets";
 
-    package = helpers.mkPackageOption "friendly-snippets" pkgs.vimPlugins.friendly-snippets;
+    package = helpers.mkPluginPackageOption "friendly-snippets" pkgs.vimPlugins.friendly-snippets;
   };
 
   config = mkIf cfg.enable {

plugins/snippets/luasnip/default.nix

@@ -13,7 +13,7 @@ in
   options.plugins.luasnip = {
     enable = mkEnableOption "luasnip";
 
-    package = helpers.mkPackageOption "luasnip" pkgs.vimPlugins.luasnip;
+    package = helpers.mkPluginPackageOption "luasnip" pkgs.vimPlugins.luasnip;
 
     extraConfig = mkOption {
       type = types.attrsOf types.anything;

plugins/statuslines/lightline.nix

@@ -14,7 +14,7 @@ in
     plugins.lightline = {
       enable = mkEnableOption "lightline";
 
-      package = helpers.mkPackageOption "lightline" pkgs.vimPlugins.lightline-vim;
+      package = helpers.mkPluginPackageOption "lightline" pkgs.vimPlugins.lightline-vim;
 
       colorscheme = mkOption {
         type = with types; nullOr str;

plugins/statuslines/lualine.nix

@@ -106,7 +106,7 @@ in
     plugins.lualine = {
       enable = mkEnableOption "lualine";
 
-      package = helpers.mkPackageOption "lualine" pkgs.vimPlugins.lualine-nvim;
+      package = helpers.mkPluginPackageOption "lualine" pkgs.vimPlugins.lualine-nvim;
 
       iconsEnabled = mkOption {
         type = types.bool;

plugins/telescope/extensions/_helpers.nix

@@ -44,7 +44,7 @@ rec {
       options.plugins.telescope.extensions.${name} = {
         enable = mkEnableOption "the `${name}` telescope extension";
 
-        package = helpers.mkPackageOption name defaultPackage;
+        package = helpers.mkPluginPackageOption name defaultPackage;
 
         settings = helpers.mkSettingsOption {
           description = "settings for the `${name}` telescope extension.";

plugins/ui/image.nix

@@ -15,7 +15,7 @@ in
   options.plugins.image = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "image.nvim";
 
-    package = helpers.mkPackageOption "image.nvim" pkgs.vimPlugins.image-nvim;
+    package = helpers.mkPluginPackageOption "image.nvim" pkgs.vimPlugins.image-nvim;
 
     backend =
       helpers.defaultNullOpts.mkEnumFirstDefault

plugins/ui/noice.nix

@@ -17,7 +17,7 @@ with lib;
         vim, regex, lua, bash, markdown, markdown_inline
     '';
 
-    package = helpers.mkPackageOption "noice" pkgs.vimPlugins.noice-nvim;
+    package = helpers.mkPluginPackageOption "noice" pkgs.vimPlugins.noice-nvim;
 
     cmdline = {
       enabled = helpers.defaultNullOpts.mkBool true "enables Noice cmdline UI";

plugins/utils/alpha.nix

@@ -53,7 +53,7 @@ in
     plugins.alpha = {
       enable = mkEnableOption "alpha-nvim";
 
-      package = helpers.mkPackageOption "alpha-nvim" pkgs.vimPlugins.alpha-nvim;
+      package = helpers.mkPluginPackageOption "alpha-nvim" pkgs.vimPlugins.alpha-nvim;
 
       iconsEnabled = mkOption {
         type = types.bool;

plugins/utils/auto-save.nix

@@ -13,7 +13,7 @@ in
   options.plugins.auto-save = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "auto-save";
 
-    package = helpers.mkPackageOption "auto-save" pkgs.vimPlugins.auto-save-nvim;
+    package = helpers.mkPluginPackageOption "auto-save" pkgs.vimPlugins.auto-save-nvim;
 
     keymaps = {
       silent = mkOption {

plugins/utils/auto-session.nix

@@ -13,7 +13,7 @@ in
   options.plugins.auto-session = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "auto-session";
 
-    package = helpers.mkPackageOption "auto-session" pkgs.vimPlugins.auto-session;
+    package = helpers.mkPluginPackageOption "auto-session" pkgs.vimPlugins.auto-session;
 
     logLevel = helpers.defaultNullOpts.mkEnum [
       "debug"

plugins/utils/autoclose.nix

@@ -15,7 +15,7 @@ in
   options.plugins.autoclose = {
     enable = mkEnableOption "autoclose.nvim";
 
-    package = helpers.mkPackageOption "autoclose.nvim" pkgs.vimPlugins.autoclose-nvim;
+    package = helpers.mkPluginPackageOption "autoclose.nvim" pkgs.vimPlugins.autoclose-nvim;
 
     keys = helpers.mkNullOrOption (with types; attrsOf anything) ''
       Configures various options, such as shortcuts for pairs, what pair of characters to use in the

plugins/utils/better-escape.nix

@@ -13,7 +13,7 @@ in
   options.plugins.better-escape = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "better-escape.nvim";
 
-    package = helpers.mkPackageOption "better-escape.nvim" pkgs.vimPlugins.better-escape-nvim;
+    package = helpers.mkPluginPackageOption "better-escape.nvim" pkgs.vimPlugins.better-escape-nvim;
 
     mapping = helpers.mkNullOrOption (with types; listOf str) ''
       List of mappings to use to enter escape mode.

plugins/utils/clipboard-image.nix

@@ -86,7 +86,7 @@ in
   options.plugins.clipboard-image = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "clipboard-image.nvim";
 
-    package = helpers.mkPackageOption "clipboard-image.nvim" pkgs.vimPlugins.clipboard-image-nvim;
+    package = helpers.mkPluginPackageOption "clipboard-image.nvim" pkgs.vimPlugins.clipboard-image-nvim;
 
     clipboardPackage = mkOption {
       type = with types; nullOr package;

plugins/utils/commentary.nix

@@ -16,7 +16,7 @@ in
     plugins.commentary = {
       enable = mkEnableOption "commentary";
 
-      package = helpers.mkPackageOption "commentary" pkgs.vimPlugins.vim-commentary;
+      package = helpers.mkPluginPackageOption "commentary" pkgs.vimPlugins.vim-commentary;
     };
   };
 

plugins/utils/conjure.nix

@@ -13,7 +13,7 @@ in
   options.plugins.conjure = {
     enable = mkEnableOption "Conjure";
 
-    package = helpers.mkPackageOption "conjure" pkgs.vimPlugins.conjure;
+    package = helpers.mkPluginPackageOption "conjure" pkgs.vimPlugins.conjure;
   };
 
   config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

plugins/utils/coverage.nix

@@ -56,7 +56,7 @@ in
   options.plugins.coverage = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-coverage";
 
-    package = helpers.mkPackageOption "nvim-coverage" pkgs.vimPlugins.nvim-coverage;
+    package = helpers.mkPluginPackageOption "nvim-coverage" pkgs.vimPlugins.nvim-coverage;
 
     keymapsSilent = mkOption {
       type = types.bool;

plugins/utils/cursorline.nix

@@ -13,7 +13,7 @@ in
   options.plugins.cursorline = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-cursorline";
 
-    package = helpers.mkPackageOption "nvim-cursorline" pkgs.vimPlugins.nvim-cursorline;
+    package = helpers.mkPluginPackageOption "nvim-cursorline" pkgs.vimPlugins.nvim-cursorline;
 
     cursorline = {
       enable = helpers.defaultNullOpts.mkBool true "Show / hide cursorline in connection with cursor moving.";

plugins/utils/dashboard.nix

@@ -14,7 +14,7 @@ in
     plugins.dashboard = {
       enable = mkEnableOption "dashboard";
 
-      package = helpers.mkPackageOption "dashboard" pkgs.vimPlugins.dashboard-nvim;
+      package = helpers.mkPluginPackageOption "dashboard" pkgs.vimPlugins.dashboard-nvim;
 
       header = mkOption {
         description = "Header text";

plugins/utils/easyescape.nix

@@ -14,7 +14,7 @@ in
     plugins.easyescape = {
       enable = mkEnableOption "easyescape";
 
-      package = helpers.mkPackageOption "easyescape" pkgs.vimPlugins.vim-easyescape;
+      package = helpers.mkPluginPackageOption "easyescape" pkgs.vimPlugins.vim-easyescape;
     };
   };
   config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

plugins/utils/flash.nix

@@ -278,7 +278,7 @@ in
     // {
       enable = mkEnableOption "flash.nvim";
 
-      package = helpers.mkPackageOption "flash.nvim" pkgs.vimPlugins.flash-nvim;
+      package = helpers.mkPluginPackageOption "flash.nvim" pkgs.vimPlugins.flash-nvim;
 
       modes =
         let

plugins/utils/floaterm.nix

@@ -200,7 +200,7 @@ in
     {
       enable = mkEnableOption "floaterm";
 
-      package = helpers.mkPackageOption "floaterm" pkgs.vimPlugins.vim-floaterm;
+      package = helpers.mkPluginPackageOption "floaterm" pkgs.vimPlugins.vim-floaterm;
 
       keymaps = keymapOptions;
     }

plugins/utils/hardtime.nix

@@ -14,7 +14,7 @@ in
     plugins.hardtime = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "hardtime";
 
-      package = helpers.mkPackageOption "hardtime" pkgs.vimPlugins.hardtime-nvim;
+      package = helpers.mkPluginPackageOption "hardtime" pkgs.vimPlugins.hardtime-nvim;
 
       maxTime = helpers.defaultNullOpts.mkUnsignedInt 1000 ''
         Maximum time (in milliseconds) to consider key presses as repeated.

plugins/utils/harpoon.nix

@@ -25,7 +25,7 @@ in
   options.plugins.harpoon = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "harpoon";
 
-    package = helpers.mkPackageOption "harpoon" pkgs.vimPlugins.harpoon;
+    package = helpers.mkPluginPackageOption "harpoon" pkgs.vimPlugins.harpoon;
 
     enableTelescope = mkEnableOption "telescope integration";
 

plugins/utils/illuminate.nix

@@ -74,7 +74,7 @@ in
     // {
       enable = mkEnableOption "vim-illuminate";
 
-      package = mkPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate;
+      package = mkPluginPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate;
 
       filetypeOverrides =
         helpers.defaultNullOpts.mkNullable

plugins/utils/intellitab.nix

@@ -14,7 +14,7 @@ in
     plugins.intellitab = {
       enable = mkEnableOption "intellitab.nvim";
 
-      package = helpers.mkPackageOption "intellitab.nvim" pkgs.vimPlugins.intellitab-nvim;
+      package = helpers.mkPluginPackageOption "intellitab.nvim" pkgs.vimPlugins.intellitab-nvim;
     };
   };
 

plugins/utils/lastplace.nix

@@ -13,7 +13,7 @@ with lib;
   options.plugins.lastplace = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "lastplace";
 
-    package = helpers.mkPackageOption "lastplace" pkgs.vimPlugins.nvim-lastplace;
+    package = helpers.mkPluginPackageOption "lastplace" pkgs.vimPlugins.nvim-lastplace;
 
     ignoreBuftype =
       helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["quickfix" "nofix" "help"]''

plugins/utils/leap.nix

@@ -13,7 +13,7 @@ in
   options.plugins.leap = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "leap.nvim";
 
-    package = helpers.mkPackageOption "leap.nvim" pkgs.vimPlugins.leap-nvim;
+    package = helpers.mkPluginPackageOption "leap.nvim" pkgs.vimPlugins.leap-nvim;
 
     addDefaultMappings = mkOption {
       type = types.bool;

plugins/utils/mark-radar.nix

@@ -13,7 +13,7 @@ in
   options.plugins.mark-radar = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "mark-radar";
 
-    package = helpers.mkPackageOption "mark-radar" pkgs.vimPlugins.mark-radar-nvim;
+    package = helpers.mkPluginPackageOption "mark-radar" pkgs.vimPlugins.mark-radar-nvim;
 
     setDefaultMappings = helpers.defaultNullOpts.mkBool true "Whether to set default mappings.";
 

plugins/utils/marks.nix

@@ -15,7 +15,7 @@ in
   options.plugins.marks = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "marks.nvim";
 
-    package = helpers.mkPackageOption "marks.nvim" pkgs.vimPlugins.marks-nvim;
+    package = helpers.mkPluginPackageOption "marks.nvim" pkgs.vimPlugins.marks-nvim;
 
     builtinMarks =
       helpers.defaultNullOpts.mkListOf

plugins/utils/mini.nix

@@ -13,7 +13,7 @@ in
   options.plugins.mini = {
     enable = mkEnableOption "mini.nvim";
 
-    package = helpers.mkPackageOption "mini.nvim" pkgs.vimPlugins.mini-nvim;
+    package = helpers.mkPluginPackageOption "mini.nvim" pkgs.vimPlugins.mini-nvim;
 
     modules = mkOption {
       type = with types; attrsOf attrs;

plugins/utils/mkdnflow.nix

@@ -13,7 +13,7 @@ in
   options.plugins.mkdnflow = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "mkdnflow.nvim";
 
-    package = helpers.mkPackageOption "mkdnflow.nvim" pkgs.vimPlugins.mkdnflow-nvim;
+    package = helpers.mkPluginPackageOption "mkdnflow.nvim" pkgs.vimPlugins.mkdnflow-nvim;
 
     modules =
       mapAttrs

plugins/utils/multicursors.nix

@@ -48,7 +48,7 @@ in
     plugins.multicursors = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "multicursors.nvim";
 
-      package = helpers.mkPackageOption "multicursors.nvim" pkgs.vimPlugins.multicursors-nvim;
+      package = helpers.mkPluginPackageOption "multicursors.nvim" pkgs.vimPlugins.multicursors-nvim;
 
       debugMode = helpers.defaultNullOpts.mkBool false "Enable debug mode.";
 

plugins/utils/navbuddy.nix

@@ -16,7 +16,7 @@ in
   options.plugins.navbuddy = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-navbuddy";
 
-    package = helpers.mkPackageOption "nvim-navbuddy" pkgs.vimPlugins.nvim-navbuddy;
+    package = helpers.mkPluginPackageOption "nvim-navbuddy" pkgs.vimPlugins.nvim-navbuddy;
 
     window = {
       border = helpers.defaultNullOpts.mkBorder "rounded" "window border" ''

plugins/utils/neogen.nix

@@ -47,7 +47,7 @@ in
   options.plugins.neogen = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "neogen";
 
-    package = helpers.mkPackageOption "neogen" pkgs.vimPlugins.neogen;
+    package = helpers.mkPluginPackageOption "neogen" pkgs.vimPlugins.neogen;
 
     keymaps = mapAttrs (
       optionsName: properties: helpers.mkNullOrOption types.str properties.description

plugins/utils/neorg.nix

@@ -13,7 +13,7 @@ with lib;
   options.plugins.neorg = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "neorg";
 
-    package = helpers.mkPackageOption "neorg" pkgs.vimPlugins.neorg;
+    package = helpers.mkPluginPackageOption "neorg" pkgs.vimPlugins.neorg;
 
     lazyLoading = helpers.defaultNullOpts.mkBool false '''';
 

plugins/utils/netman.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.netman = {
     enable = mkEnableOption "netman.nvim, a framework to access remote resources";
 
-    package = helpers.mkPackageOption "netman.nvim" pkgs.vimPlugins.netman-nvim;
+    package = helpers.mkPluginPackageOption "netman.nvim" pkgs.vimPlugins.netman-nvim;
 
     neoTreeIntegration = mkEnableOption "support for netman as a neo-tree source";
   };

plugins/utils/nix-develop.nix

@@ -13,7 +13,7 @@ in
   options.plugins.nix-develop = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nix-develop.nvim";
 
-    package = helpers.mkPackageOption "nix-develop.nvim" pkgs.vimPlugins.nix-develop-nvim;
+    package = helpers.mkPluginPackageOption "nix-develop.nvim" pkgs.vimPlugins.nix-develop-nvim;
 
     ignoredVariables = mkOption {
       type = types.attrsOf types.bool;

plugins/utils/notify.nix

@@ -13,7 +13,7 @@ in
   options.plugins.notify = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-notify";
 
-    package = helpers.mkPackageOption "nvim-notify" pkgs.vimPlugins.nvim-notify;
+    package = helpers.mkPluginPackageOption "nvim-notify" pkgs.vimPlugins.nvim-notify;
 
     level = helpers.defaultNullOpts.mkLogLevel "info" ''
       Minimum log level to display. See `vim.log.levels`.

plugins/utils/nvim-bqf.nix

@@ -13,7 +13,7 @@ in
   options.plugins.nvim-bqf = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-bqf";
 
-    package = helpers.mkPackageOption "nvim-bqf" pkgs.vimPlugins.nvim-bqf;
+    package = helpers.mkPluginPackageOption "nvim-bqf" pkgs.vimPlugins.nvim-bqf;
 
     autoEnable = helpers.defaultNullOpts.mkBool true ''
       Enable nvim-bqf in quickfix window automatically.

plugins/utils/nvim-colorizer.nix

@@ -104,7 +104,7 @@ in
     plugins.nvim-colorizer = {
       enable = mkEnableOption "nvim-colorizer";
 
-      package = helpers.mkPackageOption "nvim-colorizer" pkgs.vimPlugins.nvim-colorizer-lua;
+      package = helpers.mkPluginPackageOption "nvim-colorizer" pkgs.vimPlugins.nvim-colorizer-lua;
 
       fileTypes = mkOption {
         description = "Enable and/or configure highlighting for certain filetypes";

plugins/utils/nvim-osc52.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.nvim-osc52 = {
     enable = mkEnableOption "nvim-osc52, a plugin to use OSC52 sequences to copy/paste";
 
-    package = helpers.mkPackageOption "nvim-osc52" pkgs.vimPlugins.nvim-osc52;
+    package = helpers.mkPluginPackageOption "nvim-osc52" pkgs.vimPlugins.nvim-osc52;
 
     maxLength = helpers.defaultNullOpts.mkInt 0 "Maximum length of selection (0 for no limit)";
     silent = helpers.defaultNullOpts.mkBool false "Disable message on successful copy";

plugins/utils/nvim-ufo.nix

@@ -13,7 +13,7 @@ in
   options.plugins.nvim-ufo = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "nvim-ufo";
 
-    package = helpers.mkPackageOption "nvim-ufo" pkgs.vimPlugins.nvim-ufo;
+    package = helpers.mkPluginPackageOption "nvim-ufo" pkgs.vimPlugins.nvim-ufo;
 
     openFoldHlTimeout = helpers.defaultNullOpts.mkInt 400 ''
       Time in millisecond between the range to be highlgihted and to be cleared

plugins/utils/ollama.nix

@@ -63,7 +63,7 @@ in
   options.plugins.ollama = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "ollama.nvim";
 
-    package = helpers.mkPackageOption "ollama.nvim" pkgs.vimPlugins.ollama-nvim;
+    package = helpers.mkPluginPackageOption "ollama.nvim" pkgs.vimPlugins.ollama-nvim;
 
     model = helpers.defaultNullOpts.mkStr "mistral" ''
       The default model to use.

plugins/utils/persistence.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.persistence = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "persistence.nvim";
 
-    package = helpers.mkPackageOption "persistence.nvim" pkgs.vimPlugins.persistence-nvim;
+    package = helpers.mkPluginPackageOption "persistence.nvim" pkgs.vimPlugins.persistence-nvim;
 
     dir =
       helpers.defaultNullOpts.mkNullable (with types; either str helpers.nixvimTypes.rawLua)

plugins/utils/presence-nvim.nix

@@ -13,7 +13,7 @@ in
   options = {
     plugins.presence-nvim = helpers.neovim-plugin.extraOptionsOptions // {
       enable = mkEnableOption "presence-nvim";
-      package = helpers.mkPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
+      package = helpers.mkPluginPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
 
       # General options.
       autoUpdate = helpers.defaultNullOpts.mkBool true ''

plugins/utils/project-nvim.nix

@@ -30,7 +30,7 @@ in
   options.plugins.project-nvim = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "project.nvim";
 
-    package = helpers.mkPackageOption "project-nvim" pkgs.vimPlugins.project-nvim;
+    package = helpers.mkPluginPackageOption "project-nvim" pkgs.vimPlugins.project-nvim;
 
     manualMode = helpers.defaultNullOpts.mkBool false ''
       Manual mode doesn't automatically change your root directory, so you have the option to

plugins/utils/quickmath.nix

@@ -13,7 +13,7 @@ in
   options.plugins.quickmath = {
     enable = mkEnableOption "quickmath.nvim";
 
-    package = helpers.mkPackageOption "quickmath.nvim" pkgs.vimPlugins.quickmath-nvim;
+    package = helpers.mkPluginPackageOption "quickmath.nvim" pkgs.vimPlugins.quickmath-nvim;
 
     keymap = {
       key = helpers.mkNullOrOption types.str "Keymap to run the `:Quickmath` command.";

plugins/utils/refactoring.nix

@@ -10,7 +10,7 @@ with lib;
   options.plugins.refactoring = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "refactoring.nvim";
 
-    package = helpers.mkPackageOption "refactoring.nvim" pkgs.vimPlugins.refactoring-nvim;
+    package = helpers.mkPluginPackageOption "refactoring.nvim" pkgs.vimPlugins.refactoring-nvim;
 
     promptFuncReturnType =
       helpers.defaultNullOpts.mkNullable (with types; attrsOf bool)