helpers/vim-plugin/mkVimPlugin: rename package option to defaultPackage

This commit is contained in:
Gaetan Lepage 2024-02-15 09:51:43 +01:00 committed by Gaétan Lepage
parent 1e4c4a0add
commit d7fe40ebd8
20 changed files with 23 additions and 23 deletions

View file

@ -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)
]

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

@ -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 = {};

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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 = {};

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,5 +7,5 @@
helpers.vim-plugin.mkVimPlugin config {
name = "surround";
originalName = "surround.vim";
package = pkgs.vimPlugins.surround;
defaultPackage = pkgs.vimPlugins.surround;
}

View file

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