diff --git a/lib/neovim-plugin.nix b/lib/neovim-plugin.nix index 6fd6e2fe..fbb477a9 100644 --- a/lib/neovim-plugin.nix +++ b/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; diff --git a/lib/options.nix b/lib/options.nix index c6ac90f7..fbe2159a 100644 --- a/lib/options.nix +++ b/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 = diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix index 4448a36a..23b9511f 100644 --- a/lib/vim-plugin.nix +++ b/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 != ""); diff --git a/plugins/bufferlines/barbar.nix b/plugins/bufferlines/barbar.nix index 2c702eb8..95d3c2ff 100644 --- a/plugins/bufferlines/barbar.nix +++ b/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"; diff --git a/plugins/bufferlines/barbecue.nix b/plugins/bufferlines/barbecue.nix index 5c2be365..89f63c9a 100644 --- a/plugins/bufferlines/barbecue.nix +++ b/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. diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix index c9ccd28e..7fd893a3 100644 --- a/plugins/bufferlines/bufferline.nix +++ b/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" diff --git a/plugins/bufferlines/navic.nix b/plugins/bufferlines/navic.nix index a826dbef..232d91ec 100644 --- a/plugins/bufferlines/navic.nix +++ b/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 = "󰈙 "; diff --git a/plugins/colorschemes/dracula.nix b/plugins/colorschemes/dracula.nix index ad40d366..44bcc1a5 100644 --- a/plugins/colorschemes/dracula.nix +++ b/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; diff --git a/plugins/completion/cmp/sources/codeium-nvim.nix b/plugins/completion/cmp/sources/codeium-nvim.nix index ca7d5647..71bc75b9 100644 --- a/plugins/completion/cmp/sources/codeium-nvim.nix +++ b/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."; diff --git a/plugins/completion/copilot-lua.nix b/plugins/completion/copilot-lua.nix index 8b28ac00..f08327e9 100644 --- a/plugins/completion/copilot-lua.nix +++ b/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."; diff --git a/plugins/completion/coq-thirdparty.nix b/plugins/completion/coq-thirdparty.nix index 3e25859b..0ebea6a4 100644 --- a/plugins/completion/coq-thirdparty.nix +++ b/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 ( diff --git a/plugins/completion/lspkind.nix b/plugins/completion/lspkind.nix index 64fbc7a9..19f75f17 100644 --- a/plugins/completion/lspkind.nix +++ b/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" diff --git a/plugins/dap/dap-go.nix b/plugins/dap/dap-go.nix index 3801803c..69d0ad01 100644 --- a/plugins/dap/dap-go.nix +++ b/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. diff --git a/plugins/dap/dap-python.nix b/plugins/dap/dap-python.nix index 732b52c1..cf83fe95 100644 --- a/plugins/dap/dap-python.nix +++ b/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"; diff --git a/plugins/dap/dap-ui.nix b/plugins/dap/dap-ui.nix index b9723c0f..2f2796cd 100644 --- a/plugins/dap/dap-ui.nix +++ b/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"; diff --git a/plugins/dap/dap-virtual-text.nix b/plugins/dap/dap-virtual-text.nix index fe5a10ef..7f206efd 100644 --- a/plugins/dap/dap-virtual-text.nix +++ b/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`. diff --git a/plugins/dap/default.nix b/plugins/dap/default.nix index fdfee158..39045737 100644 --- a/plugins/dap/default.nix +++ b/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; diff --git a/plugins/filetrees/chadtree.nix b/plugins/filetrees/chadtree.nix index e58732d5..93524999 100644 --- a/plugins/filetrees/chadtree.nix +++ b/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 '' diff --git a/plugins/filetrees/neo-tree.nix b/plugins/filetrees/neo-tree.nix index fc7d62ed..779d3fb3 100644 --- a/plugins/filetrees/neo-tree.nix +++ b/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) diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix index fcca740c..437190c5 100644 --- a/plugins/filetrees/nvim-tree.nix +++ b/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"; diff --git a/plugins/git/diffview.nix b/plugins/git/diffview.nix index b7dd1fdb..04cb4b9e 100644 --- a/plugins/git/diffview.nix +++ b/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 diff --git a/plugins/git/git-worktree.nix b/plugins/git/git-worktree.nix index 461bd2c3..ec4c9b54 100644 --- a/plugins/git/git-worktree.nix +++ b/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"; diff --git a/plugins/git/gitblame.nix b/plugins/git/gitblame.nix index d56e07b3..3d6aad6c 100644 --- a/plugins/git/gitblame.nix +++ b/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 " • • " "The template for the blame message that will be shown."; diff --git a/plugins/git/gitgutter.nix b/plugins/git/gitgutter.nix index 79b2a45d..29ce0a4f 100644 --- a/plugins/git/gitgutter.nix +++ b/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; diff --git a/plugins/git/gitlinker.nix b/plugins/git/gitlinker.nix index a636461d..da9129bd 100644 --- a/plugins/git/gitlinker.nix +++ b/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."; diff --git a/plugins/git/gitmessenger.nix b/plugins/git/gitmessenger.nix index 779e2b3d..21892d1e 100644 --- a/plugins/git/gitmessenger.nix +++ b/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 diff --git a/plugins/languages/clangd-extensions.nix b/plugins/languages/clangd-extensions.nix index 933488d6..7f681536 100644 --- a/plugins/languages/clangd-extensions.nix +++ b/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: diff --git a/plugins/languages/helm.nix b/plugins/languages/helm.nix index 2d6605b9..a4783cdc 100644 --- a/plugins/languages/helm.nix +++ b/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 ]; }; diff --git a/plugins/languages/lean.nix b/plugins/languages/lean.nix index f673a030..653cf8db 100644 --- a/plugins/languages/lean.nix +++ b/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; diff --git a/plugins/languages/lint.nix b/plugins/languages/lint.nix index 0d730e7a..736ea4de 100644 --- a/plugins/languages/lint.nix +++ b/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); diff --git a/plugins/languages/nvim-jdtls.nix b/plugins/languages/nvim-jdtls.nix index 5aa7af74..6ed05f31 100644 --- a/plugins/languages/nvim-jdtls.nix +++ b/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. diff --git a/plugins/languages/openscad.nix b/plugins/languages/openscad.nix index 7cd62aef..3c7d2cc8 100644 --- a/plugins/languages/openscad.nix +++ b/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" diff --git a/plugins/languages/plantuml-syntax.nix b/plugins/languages/plantuml-syntax.nix index 5f59136e..46a865fb 100644 --- a/plugins/languages/plantuml-syntax.nix +++ b/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; diff --git a/plugins/languages/rust-tools.nix b/plugins/languages/rust-tools.nix index 07381e1c..83e86b05 100644 --- a/plugins/languages/rust-tools.nix +++ b/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; diff --git a/plugins/languages/rustaceanvim.nix b/plugins/languages/rustaceanvim.nix index 62d4f3f5..d7c4c3a0 100644 --- a/plugins/languages/rustaceanvim.nix +++ b/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; diff --git a/plugins/languages/sniprun.nix b/plugins/languages/sniprun.nix index 0501092c..60a43ccd 100644 --- a/plugins/languages/sniprun.nix +++ b/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"; diff --git a/plugins/languages/treesitter/hmts.nix b/plugins/languages/treesitter/hmts.nix index 1b269d4b..7b39dc5c 100644 --- a/plugins/languages/treesitter/hmts.nix +++ b/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 { diff --git a/plugins/languages/treesitter/rainbow-delimiters.nix b/plugins/languages/treesitter/rainbow-delimiters.nix index 9efb7e79..2d0e430c 100644 --- a/plugins/languages/treesitter/rainbow-delimiters.nix +++ b/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 diff --git a/plugins/languages/treesitter/treesitter-refactor.nix b/plugins/languages/treesitter/treesitter-refactor.nix index 0ad19810..49eb2b9d 100644 --- a/plugins/languages/treesitter/treesitter-refactor.nix +++ b/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; diff --git a/plugins/languages/treesitter/treesitter-textobjects.nix b/plugins/languages/treesitter/treesitter-textobjects.nix index 53d6b295..5426c1f5 100644 --- a/plugins/languages/treesitter/treesitter-textobjects.nix +++ b/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 '' diff --git a/plugins/languages/treesitter/ts-autotag.nix b/plugins/languages/treesitter/ts-autotag.nix index 5091a4f1..99ca02a6 100644 --- a/plugins/languages/treesitter/ts-autotag.nix +++ b/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) '' [ diff --git a/plugins/languages/treesitter/ts-context-commentstring.nix b/plugins/languages/treesitter/ts-context-commentstring.nix index 2508f205..9455789f 100644 --- a/plugins/languages/treesitter/ts-context-commentstring.nix +++ b/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; diff --git a/plugins/languages/typescript-tools.nix b/plugins/languages/typescript-tools.nix index dc742090..b7fe1532 100644 --- a/plugins/languages/typescript-tools.nix +++ b/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 { diff --git a/plugins/lsp/conform-nvim.nix b/plugins/lsp/conform-nvim.nix index 3b0935de..1c72eddd 100644 --- a/plugins/lsp/conform-nvim.nix +++ b/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" diff --git a/plugins/lsp/fidget.nix b/plugins/lsp/fidget.nix index d467ba4b..005e1882 100644 --- a/plugins/lsp/fidget.nix +++ b/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 = { diff --git a/plugins/lsp/inc-rename.nix b/plugins/lsp/inc-rename.nix index d1004649..ab088502 100644 --- a/plugins/lsp/inc-rename.nix +++ b/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"; diff --git a/plugins/lsp/language-servers/efmls-configs.nix b/plugins/lsp/language-servers/efmls-configs.nix index 500bf7bb..fffc07c5 100644 --- a/plugins/lsp/language-servers/efmls-configs.nix +++ b/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); diff --git a/plugins/lsp/lsp-format.nix b/plugins/lsp/lsp-format.nix index 3f7a307b..aa64e07d 100644 --- a/plugins/lsp/lsp-format.nix +++ b/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 = diff --git a/plugins/lsp/lsp-lines.nix b/plugins/lsp/lsp-lines.nix index 303b4524..f7b0ad1e 100644 --- a/plugins/lsp/lsp-lines.nix +++ b/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; diff --git a/plugins/lsp/lspsaga.nix b/plugins/lsp/lspsaga.nix index 79ccaed2..3084fc9b 100644 --- a/plugins/lsp/lspsaga.nix +++ b/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" ""; diff --git a/plugins/lsp/wtf.nix b/plugins/lsp/wtf.nix index d292a668..d89acc34 100644 --- a/plugins/lsp/wtf.nix +++ b/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: diff --git a/plugins/neotest/adapters.nix b/plugins/neotest/adapters.nix index 0e981b18..ffeb0546 100644 --- a/plugins/neotest/adapters.nix +++ b/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."; }; }; diff --git a/plugins/snippets/friendly-snippets.nix b/plugins/snippets/friendly-snippets.nix index 3147b9b8..b12c8c2f 100644 --- a/plugins/snippets/friendly-snippets.nix +++ b/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 { diff --git a/plugins/snippets/luasnip/default.nix b/plugins/snippets/luasnip/default.nix index 58fcccf4..89c9777b 100644 --- a/plugins/snippets/luasnip/default.nix +++ b/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; diff --git a/plugins/statuslines/lightline.nix b/plugins/statuslines/lightline.nix index 7f719716..d86aa8bd 100644 --- a/plugins/statuslines/lightline.nix +++ b/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; diff --git a/plugins/statuslines/lualine.nix b/plugins/statuslines/lualine.nix index 9bc271aa..d0b8b343 100644 --- a/plugins/statuslines/lualine.nix +++ b/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; diff --git a/plugins/telescope/extensions/_helpers.nix b/plugins/telescope/extensions/_helpers.nix index 21f1b7ca..3c06b31c 100644 --- a/plugins/telescope/extensions/_helpers.nix +++ b/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."; diff --git a/plugins/ui/image.nix b/plugins/ui/image.nix index d90819d8..3195ea3e 100644 --- a/plugins/ui/image.nix +++ b/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 diff --git a/plugins/ui/noice.nix b/plugins/ui/noice.nix index 0821ce10..8030bbc2 100644 --- a/plugins/ui/noice.nix +++ b/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"; diff --git a/plugins/utils/alpha.nix b/plugins/utils/alpha.nix index 19606a41..2febc284 100644 --- a/plugins/utils/alpha.nix +++ b/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; diff --git a/plugins/utils/auto-save.nix b/plugins/utils/auto-save.nix index 9c8eae8e..cb56cd3a 100644 --- a/plugins/utils/auto-save.nix +++ b/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 { diff --git a/plugins/utils/auto-session.nix b/plugins/utils/auto-session.nix index 3db722d0..f24768de 100644 --- a/plugins/utils/auto-session.nix +++ b/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" diff --git a/plugins/utils/autoclose.nix b/plugins/utils/autoclose.nix index c3581289..05deaf36 100644 --- a/plugins/utils/autoclose.nix +++ b/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 diff --git a/plugins/utils/better-escape.nix b/plugins/utils/better-escape.nix index 92cf0de2..47d2b843 100644 --- a/plugins/utils/better-escape.nix +++ b/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. diff --git a/plugins/utils/clipboard-image.nix b/plugins/utils/clipboard-image.nix index 8285ae3e..e6ae4fbf 100644 --- a/plugins/utils/clipboard-image.nix +++ b/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; diff --git a/plugins/utils/commentary.nix b/plugins/utils/commentary.nix index 4c94d36b..a00d1ae3 100644 --- a/plugins/utils/commentary.nix +++ b/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; }; }; diff --git a/plugins/utils/conjure.nix b/plugins/utils/conjure.nix index 4e9af81a..c33fea24 100644 --- a/plugins/utils/conjure.nix +++ b/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 ]; }; diff --git a/plugins/utils/coverage.nix b/plugins/utils/coverage.nix index 4155507c..186e1587 100644 --- a/plugins/utils/coverage.nix +++ b/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; diff --git a/plugins/utils/cursorline.nix b/plugins/utils/cursorline.nix index 8d438f6a..3cb2bd80 100644 --- a/plugins/utils/cursorline.nix +++ b/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."; diff --git a/plugins/utils/dashboard.nix b/plugins/utils/dashboard.nix index 148a5a3f..f01d5d30 100644 --- a/plugins/utils/dashboard.nix +++ b/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"; diff --git a/plugins/utils/easyescape.nix b/plugins/utils/easyescape.nix index b4a885cb..d2301cb3 100644 --- a/plugins/utils/easyescape.nix +++ b/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 ]; }; diff --git a/plugins/utils/flash.nix b/plugins/utils/flash.nix index 76b1d866..e96056ce 100644 --- a/plugins/utils/flash.nix +++ b/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 diff --git a/plugins/utils/floaterm.nix b/plugins/utils/floaterm.nix index 6b78ab87..c2d08bed 100644 --- a/plugins/utils/floaterm.nix +++ b/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; } diff --git a/plugins/utils/hardtime.nix b/plugins/utils/hardtime.nix index 320395ec..9fe0a1c8 100644 --- a/plugins/utils/hardtime.nix +++ b/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. diff --git a/plugins/utils/harpoon.nix b/plugins/utils/harpoon.nix index 8ddadbb9..9ed9c616 100644 --- a/plugins/utils/harpoon.nix +++ b/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"; diff --git a/plugins/utils/illuminate.nix b/plugins/utils/illuminate.nix index d7a0c7bf..25955bbf 100644 --- a/plugins/utils/illuminate.nix +++ b/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 diff --git a/plugins/utils/intellitab.nix b/plugins/utils/intellitab.nix index e6051a39..0e31b434 100644 --- a/plugins/utils/intellitab.nix +++ b/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; }; }; diff --git a/plugins/utils/lastplace.nix b/plugins/utils/lastplace.nix index e803db05..e4694aa4 100644 --- a/plugins/utils/lastplace.nix +++ b/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"]'' diff --git a/plugins/utils/leap.nix b/plugins/utils/leap.nix index 091aa439..6b6bf1ad 100644 --- a/plugins/utils/leap.nix +++ b/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; diff --git a/plugins/utils/mark-radar.nix b/plugins/utils/mark-radar.nix index 034c1e8f..7100fe54 100644 --- a/plugins/utils/mark-radar.nix +++ b/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."; diff --git a/plugins/utils/marks.nix b/plugins/utils/marks.nix index a1900757..a2641687 100644 --- a/plugins/utils/marks.nix +++ b/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 diff --git a/plugins/utils/mini.nix b/plugins/utils/mini.nix index debce2a3..1768192f 100644 --- a/plugins/utils/mini.nix +++ b/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; diff --git a/plugins/utils/mkdnflow.nix b/plugins/utils/mkdnflow.nix index b59a7518..b1e7c958 100644 --- a/plugins/utils/mkdnflow.nix +++ b/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 diff --git a/plugins/utils/multicursors.nix b/plugins/utils/multicursors.nix index 37ffc9a3..2993dc63 100644 --- a/plugins/utils/multicursors.nix +++ b/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."; diff --git a/plugins/utils/navbuddy.nix b/plugins/utils/navbuddy.nix index 6c9b8ff2..5e9750ae 100644 --- a/plugins/utils/navbuddy.nix +++ b/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" '' diff --git a/plugins/utils/neogen.nix b/plugins/utils/neogen.nix index 5562c051..e68a75b5 100644 --- a/plugins/utils/neogen.nix +++ b/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 diff --git a/plugins/utils/neorg.nix b/plugins/utils/neorg.nix index 9e2e6f48..9fffa36c 100644 --- a/plugins/utils/neorg.nix +++ b/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 ''''; diff --git a/plugins/utils/netman.nix b/plugins/utils/netman.nix index 6ee3c692..75c357ff 100644 --- a/plugins/utils/netman.nix +++ b/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"; }; diff --git a/plugins/utils/nix-develop.nix b/plugins/utils/nix-develop.nix index 581abb7a..19279ed2 100644 --- a/plugins/utils/nix-develop.nix +++ b/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; diff --git a/plugins/utils/notify.nix b/plugins/utils/notify.nix index 47f510a1..a9bbf11e 100644 --- a/plugins/utils/notify.nix +++ b/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`. diff --git a/plugins/utils/nvim-bqf.nix b/plugins/utils/nvim-bqf.nix index fdfc045f..2985756a 100644 --- a/plugins/utils/nvim-bqf.nix +++ b/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. diff --git a/plugins/utils/nvim-colorizer.nix b/plugins/utils/nvim-colorizer.nix index 45c7732d..47051cee 100644 --- a/plugins/utils/nvim-colorizer.nix +++ b/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"; diff --git a/plugins/utils/nvim-osc52.nix b/plugins/utils/nvim-osc52.nix index 6bc40ee1..268c0f46 100644 --- a/plugins/utils/nvim-osc52.nix +++ b/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"; diff --git a/plugins/utils/nvim-ufo.nix b/plugins/utils/nvim-ufo.nix index c12d44e8..04eea66c 100644 --- a/plugins/utils/nvim-ufo.nix +++ b/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 diff --git a/plugins/utils/ollama.nix b/plugins/utils/ollama.nix index 444702ad..30081034 100644 --- a/plugins/utils/ollama.nix +++ b/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. diff --git a/plugins/utils/persistence.nix b/plugins/utils/persistence.nix index 1cc24e96..4ee96b53 100644 --- a/plugins/utils/persistence.nix +++ b/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) diff --git a/plugins/utils/presence-nvim.nix b/plugins/utils/presence-nvim.nix index fcd772e5..e4b21169 100644 --- a/plugins/utils/presence-nvim.nix +++ b/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 '' diff --git a/plugins/utils/project-nvim.nix b/plugins/utils/project-nvim.nix index 48fa0d40..b23b578a 100644 --- a/plugins/utils/project-nvim.nix +++ b/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 diff --git a/plugins/utils/quickmath.nix b/plugins/utils/quickmath.nix index e8d11164..3e00d8da 100644 --- a/plugins/utils/quickmath.nix +++ b/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."; diff --git a/plugins/utils/refactoring.nix b/plugins/utils/refactoring.nix index 99de9969..5ddfe5d8 100644 --- a/plugins/utils/refactoring.nix +++ b/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) diff --git a/plugins/utils/specs.nix b/plugins/utils/specs.nix index 55948cfd..82e5ee01 100644 --- a/plugins/utils/specs.nix +++ b/plugins/utils/specs.nix @@ -13,7 +13,7 @@ in options.plugins.specs = { enable = mkEnableOption "specs-nvim"; - package = helpers.mkPackageOption "specs-nvim" pkgs.vimPlugins.specs-nvim; + package = helpers.mkPluginPackageOption "specs-nvim" pkgs.vimPlugins.specs-nvim; show_jumps = mkOption { type = types.bool; diff --git a/plugins/utils/spider.nix b/plugins/utils/spider.nix index 8f90872c..7c9160ce 100644 --- a/plugins/utils/spider.nix +++ b/plugins/utils/spider.nix @@ -14,7 +14,7 @@ in options.plugins.${pluginName} = helpers.neovim-plugin.extraOptionsOptions // { enable = mkEnableOption pluginName; - package = helpers.mkPackageOption pluginName pkgs.vimPlugins.nvim-spider; + package = helpers.mkPluginPackageOption pluginName pkgs.vimPlugins.nvim-spider; skipInsignificantPunctuation = helpers.defaultNullOpts.mkBool true "Whether to skip insignificant punctuation."; diff --git a/plugins/utils/startup.nix b/plugins/utils/startup.nix index fdc78d26..22eb0cbd 100644 --- a/plugins/utils/startup.nix +++ b/plugins/utils/startup.nix @@ -15,7 +15,7 @@ in options.plugins.startup = helpers.neovim-plugin.extraOptionsOptions // { enable = mkEnableOption "startup.nvim"; - package = helpers.mkPackageOption "startup.nvim" pkgs.vimPlugins.startup-nvim; + package = helpers.mkPluginPackageOption "startup.nvim" pkgs.vimPlugins.startup-nvim; theme = helpers.defaultNullOpts.mkStr "dashboard" '' Use a pre-defined theme. diff --git a/plugins/utils/todo-comments.nix b/plugins/utils/todo-comments.nix index d0bee756..34df6829 100644 --- a/plugins/utils/todo-comments.nix +++ b/plugins/utils/todo-comments.nix @@ -28,7 +28,7 @@ in plugins.todo-comments = helpers.neovim-plugin.extraOptionsOptions // { enable = mkEnableOption "todo-comments"; - package = helpers.mkPackageOption "todo-comments" pkgs.vimPlugins.todo-comments-nvim; + package = helpers.mkPluginPackageOption "todo-comments" pkgs.vimPlugins.todo-comments-nvim; ripgrepPackage = mkOption { type = with types; nullOr package; diff --git a/plugins/utils/vim-bbye.nix b/plugins/utils/vim-bbye.nix index 927a4cbe..03d136ac 100644 --- a/plugins/utils/vim-bbye.nix +++ b/plugins/utils/vim-bbye.nix @@ -13,7 +13,7 @@ in options.plugins.vim-bbye = { enable = mkEnableOption "vim-bbye"; - package = helpers.mkPackageOption "vim-bbye" pkgs.vimPlugins.vim-bbye; + package = helpers.mkPluginPackageOption "vim-bbye" pkgs.vimPlugins.vim-bbye; keymapsSilent = mkOption { type = types.bool; diff --git a/plugins/utils/vim-matchup.nix b/plugins/utils/vim-matchup.nix index 368bef6e..e4aa0b72 100644 --- a/plugins/utils/vim-matchup.nix +++ b/plugins/utils/vim-matchup.nix @@ -10,7 +10,7 @@ with lib; options.plugins.vim-matchup = { enable = mkEnableOption "vim-matchup"; - package = helpers.mkPackageOption "vim-matchup" pkgs.vimPlugins.vim-matchup; + package = helpers.mkPluginPackageOption "vim-matchup" pkgs.vimPlugins.vim-matchup; treesitterIntegration = { enable = mkEnableOption "treesitter integration"; diff --git a/plugins/utils/which-key.nix b/plugins/utils/which-key.nix index 318ad14a..4831a3b2 100644 --- a/plugins/utils/which-key.nix +++ b/plugins/utils/which-key.nix @@ -10,7 +10,7 @@ with lib; options.plugins.which-key = { enable = mkEnableOption "which-key.nvim, a plugin that popup with possible key bindings of the command you started typing"; - package = helpers.mkPackageOption "which-key-nvim" pkgs.vimPlugins.which-key-nvim; + package = helpers.mkPluginPackageOption "which-key-nvim" pkgs.vimPlugins.which-key-nvim; registrations = mkOption { type = with types; attrsOf anything; diff --git a/plugins/utils/wilder.nix b/plugins/utils/wilder.nix index 5737be08..74ef4810 100644 --- a/plugins/utils/wilder.nix +++ b/plugins/utils/wilder.nix @@ -66,7 +66,7 @@ in options.plugins.wilder = helpers.neovim-plugin.extraOptionsOptions // { enable = mkEnableOption "wilder-nvim"; - package = helpers.mkPackageOption "wilder-nvim" pkgs.vimPlugins.wilder-nvim; + package = helpers.mkPluginPackageOption "wilder-nvim" pkgs.vimPlugins.wilder-nvim; ### Setup options ### enableCmdlineEnter = helpers.defaultNullOpts.mkBool true '' diff --git a/plugins/utils/yanky.nix b/plugins/utils/yanky.nix index 6694c468..924e5920 100644 --- a/plugins/utils/yanky.nix +++ b/plugins/utils/yanky.nix @@ -13,7 +13,7 @@ in options.plugins.yanky = helpers.neovim-plugin.extraOptionsOptions // { enable = mkEnableOption "yanky.nvim"; - package = helpers.mkPackageOption "yanky.nvim" pkgs.vimPlugins.yanky-nvim; + package = helpers.mkPluginPackageOption "yanky.nvim" pkgs.vimPlugins.yanky-nvim; ring = { historyLength = helpers.defaultNullOpts.mkUnsignedInt 100 '' diff --git a/plugins/utils/zk.nix b/plugins/utils/zk.nix index c5d07b3b..2b31f7c4 100644 --- a/plugins/utils/zk.nix +++ b/plugins/utils/zk.nix @@ -10,7 +10,7 @@ with lib; options.plugins.zk = { enable = mkEnableOption "zk.nvim, a plugin to integrate with zk"; - package = helpers.mkPackageOption "zk.nvim" pkgs.vimPlugins.zk-nvim; + package = helpers.mkPluginPackageOption "zk.nvim" pkgs.vimPlugins.zk-nvim; picker = helpers.defaultNullOpts.mkEnumFirstDefault