From d7fe40ebd8c57a5108717d1a3ae47c7885c17128 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 15 Feb 2024 09:51:43 +0100 Subject: [PATCH] helpers/vim-plugin/mkVimPlugin: rename package option to defaultPackage --- lib/vim-plugin.nix | 8 ++++---- plugins/completion/copilot-vim.nix | 2 +- plugins/git/committia.nix | 2 +- plugins/git/fugitive.nix | 2 +- plugins/languages/ledger.nix | 2 +- plugins/languages/markdown-preview.nix | 2 +- plugins/languages/nix.nix | 2 +- plugins/languages/tagbar.nix | 2 +- plugins/languages/vim-slime.nix | 2 +- plugins/languages/zig.nix | 2 +- plugins/statuslines/airline.nix | 2 +- plugins/utils/emmet.nix | 2 +- plugins/utils/endwise.nix | 2 +- plugins/utils/goyo.nix | 2 +- plugins/utils/instant.nix | 2 +- plugins/utils/magma-nvim.nix | 2 +- plugins/utils/molten.nix | 2 +- plugins/utils/startify.nix | 2 +- plugins/utils/surround.nix | 2 +- plugins/utils/undotree.nix | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix index f7001e32..fbca32c1 100644 --- a/lib/vim-plugin.nix +++ b/lib/vim-plugin.nix @@ -10,7 +10,7 @@ with lib; { imports ? [], # options originalName ? name, - package ? null, + defaultPackage ? null, options ? {}, settingsOptions ? {}, settingsExample ? null, @@ -51,10 +51,10 @@ with lib; { # does this evaluate package? packageOption = - if package == null + if defaultPackage == null then {} else { - package = nixvimOptions.mkPackageOption name package; + package = nixvimOptions.mkPackageOption name defaultPackage; }; createSettingsOption = (isString globalPrefix) && (globalPrefix != ""); @@ -103,7 +103,7 @@ with lib; { inherit extraPackages; globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) globals; # does this evaluate package? it would not be desired to evaluate pacakge if we use another package. - extraPlugins = extraPlugins ++ optional (package != null) cfg.package; + extraPlugins = extraPlugins ++ optional (defaultPackage != null) cfg.package; } (extraConfig cfg) ] diff --git a/plugins/completion/copilot-vim.nix b/plugins/completion/copilot-vim.nix index 62f5f1c0..54ee35b8 100644 --- a/plugins/completion/copilot-vim.nix +++ b/plugins/completion/copilot-vim.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; helpers.vim-plugin.mkVimPlugin config { name = "copilot-vim"; originalName = "copilot.vim"; - package = pkgs.vimPlugins.copilot-vim; + defaultPackage = pkgs.vimPlugins.copilot-vim; globalPrefix = "copilot_"; addExtraConfigRenameWarning = true; diff --git a/plugins/git/committia.nix b/plugins/git/committia.nix index 79454746..14790f3b 100644 --- a/plugins/git/committia.nix +++ b/plugins/git/committia.nix @@ -8,7 +8,7 @@ helpers.vim-plugin.mkVimPlugin config { name = "committia"; originalName = "committia.vim"; - package = pkgs.vimPlugins.committia-vim; + defaultPackage = pkgs.vimPlugins.committia-vim; globalPrefix = "committia_"; extraPackages = [pkgs.git]; diff --git a/plugins/git/fugitive.nix b/plugins/git/fugitive.nix index 7532be4a..4f60c453 100644 --- a/plugins/git/fugitive.nix +++ b/plugins/git/fugitive.nix @@ -7,7 +7,7 @@ helpers.vim-plugin.mkVimPlugin config { name = "fugitive"; originalName = "vim-fugitive"; - package = pkgs.vimPlugins.vim-fugitive; + defaultPackage = pkgs.vimPlugins.vim-fugitive; extraPackages = [pkgs.git]; # In typical tpope fashion, this plugin has no config options diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix index caf71870..9addf2dd 100644 --- a/plugins/languages/ledger.nix +++ b/plugins/languages/ledger.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "ledger"; originalName = "vim-ledger"; - package = pkgs.vimPlugins.vim-ledger; + defaultPackage = pkgs.vimPlugins.vim-ledger; globalPrefix = "ledger_"; addExtraConfigRenameWarning = true; diff --git a/plugins/languages/markdown-preview.nix b/plugins/languages/markdown-preview.nix index e79ea52a..2d5cda4a 100644 --- a/plugins/languages/markdown-preview.nix +++ b/plugins/languages/markdown-preview.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "markdown-preview"; originalName = "markdown-preview.nvim"; - package = pkgs.vimPlugins.markdown-preview-nvim; + defaultPackage = pkgs.vimPlugins.markdown-preview-nvim; globalPrefix = "mkdp_"; addExtraConfigRenameWarning = true; diff --git a/plugins/languages/nix.nix b/plugins/languages/nix.nix index 0f8ee14e..f718c403 100644 --- a/plugins/languages/nix.nix +++ b/plugins/languages/nix.nix @@ -7,7 +7,7 @@ helpers.vim-plugin.mkVimPlugin config { name = "nix"; originalName = "vim-nix"; - package = pkgs.vimPlugins.vim-nix; + defaultPackage = pkgs.vimPlugins.vim-nix; # Possibly add option to disable Treesitter highlighting if this is installed options = {}; diff --git a/plugins/languages/tagbar.nix b/plugins/languages/tagbar.nix index 62b942f2..e6fc0403 100644 --- a/plugins/languages/tagbar.nix +++ b/plugins/languages/tagbar.nix @@ -6,7 +6,7 @@ }: helpers.vim-plugin.mkVimPlugin config { name = "tagbar"; - package = pkgs.vimPlugins.tagbar; + defaultPackage = pkgs.vimPlugins.tagbar; globalPrefix = "tagbar_"; addExtraConfigRenameWarning = true; extraPackages = [pkgs.ctags]; diff --git a/plugins/languages/vim-slime.nix b/plugins/languages/vim-slime.nix index 973246e4..92993c70 100644 --- a/plugins/languages/vim-slime.nix +++ b/plugins/languages/vim-slime.nix @@ -9,7 +9,7 @@ with lib; with helpers.vim-plugin; mkVimPlugin config { name = "vim-slime"; - package = pkgs.vimPlugins.vim-slime; + defaultPackage = pkgs.vimPlugins.vim-slime; globalPrefix = "slime_"; addExtraConfigRenameWarning = true; diff --git a/plugins/languages/zig.nix b/plugins/languages/zig.nix index a77f11c7..faf361b0 100644 --- a/plugins/languages/zig.nix +++ b/plugins/languages/zig.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "zig"; originalName = "zig.vim"; - package = pkgs.vimPlugins.zig-vim; + defaultPackage = pkgs.vimPlugins.zig-vim; globalPrefix = "zig_"; addExtraConfigRenameWarning = true; diff --git a/plugins/statuslines/airline.nix b/plugins/statuslines/airline.nix index eca32105..ad1d2950 100644 --- a/plugins/statuslines/airline.nix +++ b/plugins/statuslines/airline.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "airline"; originalName = "vim-airline"; - package = pkgs.vimPlugins.vim-airline; + defaultPackage = pkgs.vimPlugins.vim-airline; globalPrefix = "airline_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/emmet.nix b/plugins/utils/emmet.nix index 341bfd6a..56f47180 100644 --- a/plugins/utils/emmet.nix +++ b/plugins/utils/emmet.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "emmet"; originalName = "emmet-vim"; - package = pkgs.vimPlugins.emmet-vim; + defaultPackage = pkgs.vimPlugins.emmet-vim; globalPrefix = "user_emmet_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/endwise.nix b/plugins/utils/endwise.nix index b08c37c5..89d3afad 100644 --- a/plugins/utils/endwise.nix +++ b/plugins/utils/endwise.nix @@ -7,7 +7,7 @@ helpers.vim-plugin.mkVimPlugin config { name = "endwise"; originalName = "vim-endwise"; - package = pkgs.vimPlugins.vim-endwise; + defaultPackage = pkgs.vimPlugins.vim-endwise; # Yes it's really not configurable options = {}; diff --git a/plugins/utils/goyo.nix b/plugins/utils/goyo.nix index 4ed301d3..b8dcaa12 100644 --- a/plugins/utils/goyo.nix +++ b/plugins/utils/goyo.nix @@ -10,7 +10,7 @@ with lib; mkVimPlugin config { name = "goyo"; originalName = "goyo.vim"; - package = pkgs.vimPlugins.goyo-vim; + defaultPackage = pkgs.vimPlugins.goyo-vim; globalPrefix = "goyo_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/instant.nix b/plugins/utils/instant.nix index 5111b8b8..42b63676 100644 --- a/plugins/utils/instant.nix +++ b/plugins/utils/instant.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "instant"; originalName = "instant.nvim"; - package = pkgs.vimPlugins.instant-nvim; + defaultPackage = pkgs.vimPlugins.instant-nvim; globalPrefix = "instant_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/magma-nvim.nix b/plugins/utils/magma-nvim.nix index 2c531cd4..5b06f3c9 100644 --- a/plugins/utils/magma-nvim.nix +++ b/plugins/utils/magma-nvim.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "magma-nvim"; originalName = "magma-nvim"; - package = pkgs.vimPlugins.magma-nvim-goose; + defaultPackage = pkgs.vimPlugins.magma-nvim-goose; globalPrefix = "magma_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/molten.nix b/plugins/utils/molten.nix index 76c14e80..0780ec16 100644 --- a/plugins/utils/molten.nix +++ b/plugins/utils/molten.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "molten"; originalName = "molten-nvim"; - package = pkgs.vimPlugins.molten-nvim; + defaultPackage = pkgs.vimPlugins.molten-nvim; globalPrefix = "molten_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/startify.nix b/plugins/utils/startify.nix index 43f30adc..19ef4eba 100644 --- a/plugins/utils/startify.nix +++ b/plugins/utils/startify.nix @@ -10,7 +10,7 @@ with helpers.vim-plugin; mkVimPlugin config { name = "startify"; originalName = "vim-startify"; - package = pkgs.vimPlugins.vim-startify; + defaultPackage = pkgs.vimPlugins.vim-startify; globalPrefix = "startify_"; addExtraConfigRenameWarning = true; diff --git a/plugins/utils/surround.nix b/plugins/utils/surround.nix index f90cb515..d7fed4c5 100644 --- a/plugins/utils/surround.nix +++ b/plugins/utils/surround.nix @@ -7,5 +7,5 @@ helpers.vim-plugin.mkVimPlugin config { name = "surround"; originalName = "surround.vim"; - package = pkgs.vimPlugins.surround; + defaultPackage = pkgs.vimPlugins.surround; } diff --git a/plugins/utils/undotree.nix b/plugins/utils/undotree.nix index e3d2abb9..766d0b80 100644 --- a/plugins/utils/undotree.nix +++ b/plugins/utils/undotree.nix @@ -9,7 +9,7 @@ with lib; with helpers.vim-plugin; mkVimPlugin config { name = "undotree"; - package = pkgs.vimPlugins.undotree; + defaultPackage = pkgs.vimPlugins.undotree; globalPrefix = "undotree_"; addExtraConfigRenameWarning = true;