mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
lib/vim-plugin.nix
View file

@ -10,7 +10,7 @@ with lib; {
imports ? [], imports ? [],
# options # options
originalName ? name, originalName ? name,
package ? null, defaultPackage ? null,
options ? {}, options ? {},
settingsOptions ? {}, settingsOptions ? {},
settingsExample ? null, settingsExample ? null,
@ -51,10 +51,10 @@ with lib; {
# does this evaluate package? # does this evaluate package?
packageOption = packageOption =
if package == null if defaultPackage == null
then {} then {}
else { else {
package = nixvimOptions.mkPackageOption name package; package = nixvimOptions.mkPackageOption name defaultPackage;
}; };
createSettingsOption = (isString globalPrefix) && (globalPrefix != ""); createSettingsOption = (isString globalPrefix) && (globalPrefix != "");
@ -103,7 +103,7 @@ with lib; {
inherit extraPackages; inherit extraPackages;
globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) globals; globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) globals;
# does this evaluate package? it would not be desired to evaluate pacakge if we use another package. # 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) (extraConfig cfg)
] ]

2
plugins/completion/copilot-vim.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
helpers.vim-plugin.mkVimPlugin config { helpers.vim-plugin.mkVimPlugin config {
name = "copilot-vim"; name = "copilot-vim";
originalName = "copilot.vim"; originalName = "copilot.vim";
package = pkgs.vimPlugins.copilot-vim; defaultPackage = pkgs.vimPlugins.copilot-vim;
globalPrefix = "copilot_"; globalPrefix = "copilot_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/git/committia.nix
View file

@ -8,7 +8,7 @@
helpers.vim-plugin.mkVimPlugin config { helpers.vim-plugin.mkVimPlugin config {
name = "committia"; name = "committia";
originalName = "committia.vim"; originalName = "committia.vim";
package = pkgs.vimPlugins.committia-vim; defaultPackage = pkgs.vimPlugins.committia-vim;
globalPrefix = "committia_"; globalPrefix = "committia_";
extraPackages = [pkgs.git]; extraPackages = [pkgs.git];

2
plugins/git/fugitive.nix
View file

@ -7,7 +7,7 @@
helpers.vim-plugin.mkVimPlugin config { helpers.vim-plugin.mkVimPlugin config {
name = "fugitive"; name = "fugitive";
originalName = "vim-fugitive"; originalName = "vim-fugitive";
package = pkgs.vimPlugins.vim-fugitive; defaultPackage = pkgs.vimPlugins.vim-fugitive;
extraPackages = [pkgs.git]; extraPackages = [pkgs.git];
# In typical tpope fashion, this plugin has no config options # In typical tpope fashion, this plugin has no config options

2
plugins/languages/ledger.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "ledger"; name = "ledger";
originalName = "vim-ledger"; originalName = "vim-ledger";
package = pkgs.vimPlugins.vim-ledger; defaultPackage = pkgs.vimPlugins.vim-ledger;
globalPrefix = "ledger_"; globalPrefix = "ledger_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/languages/markdown-preview.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "markdown-preview"; name = "markdown-preview";
originalName = "markdown-preview.nvim"; originalName = "markdown-preview.nvim";
package = pkgs.vimPlugins.markdown-preview-nvim; defaultPackage = pkgs.vimPlugins.markdown-preview-nvim;
globalPrefix = "mkdp_"; globalPrefix = "mkdp_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/languages/nix.nix
View file

@ -7,7 +7,7 @@
helpers.vim-plugin.mkVimPlugin config { helpers.vim-plugin.mkVimPlugin config {
name = "nix"; name = "nix";
originalName = "vim-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 # Possibly add option to disable Treesitter highlighting if this is installed
options = {}; options = {};

2
plugins/languages/tagbar.nix
View file

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

2
plugins/languages/vim-slime.nix
View file

@ -9,7 +9,7 @@ with lib;
with helpers.vim-plugin; with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "vim-slime"; name = "vim-slime";
package = pkgs.vimPlugins.vim-slime; defaultPackage = pkgs.vimPlugins.vim-slime;
globalPrefix = "slime_"; globalPrefix = "slime_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/languages/zig.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "zig"; name = "zig";
originalName = "zig.vim"; originalName = "zig.vim";
package = pkgs.vimPlugins.zig-vim; defaultPackage = pkgs.vimPlugins.zig-vim;
globalPrefix = "zig_"; globalPrefix = "zig_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/statuslines/airline.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "airline"; name = "airline";
originalName = "vim-airline"; originalName = "vim-airline";
package = pkgs.vimPlugins.vim-airline; defaultPackage = pkgs.vimPlugins.vim-airline;
globalPrefix = "airline_"; globalPrefix = "airline_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/emmet.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "emmet"; name = "emmet";
originalName = "emmet-vim"; originalName = "emmet-vim";
package = pkgs.vimPlugins.emmet-vim; defaultPackage = pkgs.vimPlugins.emmet-vim;
globalPrefix = "user_emmet_"; globalPrefix = "user_emmet_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/endwise.nix
View file

@ -7,7 +7,7 @@
helpers.vim-plugin.mkVimPlugin config { helpers.vim-plugin.mkVimPlugin config {
name = "endwise"; name = "endwise";
originalName = "vim-endwise"; originalName = "vim-endwise";
package = pkgs.vimPlugins.vim-endwise; defaultPackage = pkgs.vimPlugins.vim-endwise;
# Yes it's really not configurable # Yes it's really not configurable
options = {}; options = {};

2
plugins/utils/goyo.nix
View file

@ -10,7 +10,7 @@ with lib;
mkVimPlugin config { mkVimPlugin config {
name = "goyo"; name = "goyo";
originalName = "goyo.vim"; originalName = "goyo.vim";
package = pkgs.vimPlugins.goyo-vim; defaultPackage = pkgs.vimPlugins.goyo-vim;
globalPrefix = "goyo_"; globalPrefix = "goyo_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/instant.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "instant"; name = "instant";
originalName = "instant.nvim"; originalName = "instant.nvim";
package = pkgs.vimPlugins.instant-nvim; defaultPackage = pkgs.vimPlugins.instant-nvim;
globalPrefix = "instant_"; globalPrefix = "instant_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/magma-nvim.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "magma-nvim"; name = "magma-nvim";
originalName = "magma-nvim"; originalName = "magma-nvim";
package = pkgs.vimPlugins.magma-nvim-goose; defaultPackage = pkgs.vimPlugins.magma-nvim-goose;
globalPrefix = "magma_"; globalPrefix = "magma_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/molten.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "molten"; name = "molten";
originalName = "molten-nvim"; originalName = "molten-nvim";
package = pkgs.vimPlugins.molten-nvim; defaultPackage = pkgs.vimPlugins.molten-nvim;
globalPrefix = "molten_"; globalPrefix = "molten_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/startify.nix
View file

@ -10,7 +10,7 @@ with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "startify"; name = "startify";
originalName = "vim-startify"; originalName = "vim-startify";
package = pkgs.vimPlugins.vim-startify; defaultPackage = pkgs.vimPlugins.vim-startify;
globalPrefix = "startify_"; globalPrefix = "startify_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;

2
plugins/utils/surround.nix
View file

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

2
plugins/utils/undotree.nix
View file

@ -9,7 +9,7 @@ with lib;
with helpers.vim-plugin; with helpers.vim-plugin;
mkVimPlugin config { mkVimPlugin config {
name = "undotree"; name = "undotree";
package = pkgs.vimPlugins.undotree; defaultPackage = pkgs.vimPlugins.undotree;
globalPrefix = "undotree_"; globalPrefix = "undotree_";
addExtraConfigRenameWarning = true; addExtraConfigRenameWarning = true;