diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix index f975096a..62466080 100644 --- a/lib/vim-plugin.nix +++ b/lib/vim-plugin.nix @@ -2,7 +2,6 @@ with lib; { mkVimPlugin = - config: { name, url ? if defaultPackage != null then defaultPackage.meta.homepage else null, @@ -30,10 +29,6 @@ with lib; let namespace = if isColorscheme then "colorschemes" else "plugins"; - cfg = config.${namespace}.${name}; - - globals = cfg.settings or { }; - # does this evaluate package? packageOption = if defaultPackage == null then @@ -58,6 +53,27 @@ with lib; ''; }; }; + + modules = [ + ( + { config, ... }: + let + cfg = config.${namespace}.${name}; + in + { + config = mkIf cfg.enable (mkMerge [ + { + inherit extraPackages; + globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) (cfg.settings or { }); + # does this evaluate package? it would not be desired to evaluate package if we use another package. + extraPlugins = extraPlugins ++ optional (defaultPackage != null) cfg.package; + } + (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; }) + (extraConfig cfg) + ]); + } + ) + ]; in { meta = { @@ -86,17 +102,8 @@ with lib; ++ (optional (deprecateExtraConfig && createSettingsOption) ( mkRenamedOptionModule (basePluginPath ++ [ "extraConfig" ]) settingsPath )) - ++ (nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings); + ++ (nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings) + ++ modules; - config = mkIf cfg.enable (mkMerge [ - { - inherit extraPackages; - globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) globals; - # does this evaluate package? it would not be desired to evaluate package if we use another package. - extraPlugins = extraPlugins ++ optional (defaultPackage != null) cfg.package; - } - (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; }) - (extraConfig cfg) - ]); }; } diff --git a/plugins/colorschemes/everforest.nix b/plugins/colorschemes/everforest.nix index 46f13a0d..2260b704 100644 --- a/plugins/colorschemes/everforest.nix +++ b/plugins/colorschemes/everforest.nix @@ -1,6 +1,5 @@ { lib, - config, pkgs, ... }: @@ -15,7 +14,7 @@ let ] pluginDefault desc; in -lib.nixvim.vim-plugin.mkVimPlugin config { +lib.nixvim.vim-plugin.mkVimPlugin { name = "everforest"; isColorscheme = true; defaultPackage = pkgs.vimPlugins.everforest; diff --git a/plugins/colorschemes/melange.nix b/plugins/colorschemes/melange.nix index 8972fd35..58128d66 100644 --- a/plugins/colorschemes/melange.nix +++ b/plugins/colorschemes/melange.nix @@ -1,10 +1,9 @@ { lib, - config, pkgs, ... }: -lib.nixvim.vim-plugin.mkVimPlugin config { +lib.nixvim.vim-plugin.mkVimPlugin { name = "melange"; isColorscheme = true; originalName = "melange-nvim"; diff --git a/plugins/colorschemes/nord.nix b/plugins/colorschemes/nord.nix index e1f04221..d440fbc1 100644 --- a/plugins/colorschemes/nord.nix +++ b/plugins/colorschemes/nord.nix @@ -1,13 +1,12 @@ { lib, - config, pkgs, ... }: let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.vim-plugin.mkVimPlugin config { +lib.nixvim.vim-plugin.mkVimPlugin { name = "nord"; isColorscheme = true; originalName = "nord.nvim"; diff --git a/plugins/colorschemes/one.nix b/plugins/colorschemes/one.nix index 35d7fb2d..a7a3873b 100644 --- a/plugins/colorschemes/one.nix +++ b/plugins/colorschemes/one.nix @@ -1,10 +1,9 @@ { lib, - config, pkgs, ... }: -lib.nixvim.vim-plugin.mkVimPlugin config { +lib.nixvim.vim-plugin.mkVimPlugin { name = "one"; isColorscheme = true; originalName = "vim-one"; diff --git a/plugins/colorschemes/oxocarbon.nix b/plugins/colorschemes/oxocarbon.nix index 88a5af75..20690eed 100644 --- a/plugins/colorschemes/oxocarbon.nix +++ b/plugins/colorschemes/oxocarbon.nix @@ -1,10 +1,9 @@ { lib, - config, pkgs, ... }: -lib.nixvim.vim-plugin.mkVimPlugin config { +lib.nixvim.vim-plugin.mkVimPlugin { name = "oxocarbon"; isColorscheme = true; originalName = "oxocarbon.nvim"; diff --git a/plugins/completion/cmp/sources/_mk-cmp-plugin.nix b/plugins/completion/cmp/sources/_mk-cmp-plugin.nix index 8dbfceaa..50801b9c 100644 --- a/plugins/completion/cmp/sources/_mk-cmp-plugin.nix +++ b/plugins/completion/cmp/sources/_mk-cmp-plugin.nix @@ -1,7 +1,6 @@ { lib, helpers, - config, pkgs, ... }: @@ -13,7 +12,7 @@ imports ? [ ], ... }@args: -helpers.vim-plugin.mkVimPlugin config ( +helpers.vim-plugin.mkVimPlugin ( builtins.removeAttrs args [ "pluginName" "sourceName" diff --git a/plugins/completion/codeium-vim.nix b/plugins/completion/codeium-vim.nix index aa1d784f..e5d0a292 100644 --- a/plugins/completion/codeium-vim.nix +++ b/plugins/completion/codeium-vim.nix @@ -1,7 +1,6 @@ { lib, helpers, - config, pkgs, ... }: @@ -35,7 +34,7 @@ let }; }; in -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "codeium-vim"; originalName = "codeium.vim"; defaultPackage = pkgs.vimPlugins.codeium-vim; diff --git a/plugins/completion/copilot-vim.nix b/plugins/completion/copilot-vim.nix index e52fb32e..78c13941 100644 --- a/plugins/completion/copilot-vim.nix +++ b/plugins/completion/copilot-vim.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "copilot-vim"; originalName = "copilot.vim"; defaultPackage = pkgs.vimPlugins.copilot-vim; diff --git a/plugins/git/committia.nix b/plugins/git/committia.nix index 211d1609..f7279478 100644 --- a/plugins/git/committia.nix +++ b/plugins/git/committia.nix @@ -1,10 +1,9 @@ { - config, helpers, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "committia"; originalName = "committia.vim"; defaultPackage = pkgs.vimPlugins.committia-vim; diff --git a/plugins/git/fugitive.nix b/plugins/git/fugitive.nix index a410a416..e8ae1474 100644 --- a/plugins/git/fugitive.nix +++ b/plugins/git/fugitive.nix @@ -1,11 +1,10 @@ { - config, lib, helpers, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "fugitive"; originalName = "vim-fugitive"; defaultPackage = pkgs.vimPlugins.vim-fugitive; diff --git a/plugins/git/gitignore.nix b/plugins/git/gitignore.nix index 5efd7eab..c86623fb 100644 --- a/plugins/git/gitignore.nix +++ b/plugins/git/gitignore.nix @@ -1,14 +1,13 @@ { lib, helpers, - config, pkgs, ... }: with lib; # We use `mkVimPlugin` to avoid having a `settings` option. # Indeed, this plugin is not configurable in the common sense (no `setup` function). -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "gitignore"; originalName = "gitignore.nvim"; defaultPackage = pkgs.vimPlugins.gitignore-nvim; diff --git a/plugins/git/lazygit.nix b/plugins/git/lazygit.nix index e2885a67..5395622b 100644 --- a/plugins/git/lazygit.nix +++ b/plugins/git/lazygit.nix @@ -1,12 +1,11 @@ { - config, lib, helpers, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "lazygit"; originalName = "lazygit.nvim"; defaultPackage = pkgs.vimPlugins.lazygit-nvim; diff --git a/plugins/languages/godot.nix b/plugins/languages/godot.nix index 538683a3..459410e5 100644 --- a/plugins/languages/godot.nix +++ b/plugins/languages/godot.nix @@ -1,12 +1,11 @@ { - config, lib, helpers, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "godot"; originalName = "vim-godot"; defaultPackage = pkgs.vimPlugins.vim-godot; diff --git a/plugins/languages/haskell-scope-highlighting.nix b/plugins/languages/haskell-scope-highlighting.nix index aa6403e4..dd250afa 100644 --- a/plugins/languages/haskell-scope-highlighting.nix +++ b/plugins/languages/haskell-scope-highlighting.nix @@ -6,7 +6,7 @@ ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "haskell-scope-highlighting"; originalName = "haskell-scope-highlighting.nvim"; defaultPackage = pkgs.vimPlugins.haskell-scope-highlighting-nvim; diff --git a/plugins/languages/julia/julia-cell.nix b/plugins/languages/julia/julia-cell.nix index ed24551f..e43e14ef 100644 --- a/plugins/languages/julia/julia-cell.nix +++ b/plugins/languages/julia/julia-cell.nix @@ -1,7 +1,6 @@ { lib, helpers, - config, pkgs, ... }: @@ -37,7 +36,7 @@ let }; in with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "julia-cell"; originalName = "vim-julia-cell"; defaultPackage = pkgs.vimPlugins.vim-julia-cell; diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix index 9552ece4..09cc5c34 100644 --- a/plugins/languages/ledger.nix +++ b/plugins/languages/ledger.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "ledger"; originalName = "vim-ledger"; defaultPackage = pkgs.vimPlugins.vim-ledger; diff --git a/plugins/languages/markdown/markdown-preview.nix b/plugins/languages/markdown/markdown-preview.nix index 8cc37e8a..eee7d1a6 100644 --- a/plugins/languages/markdown/markdown-preview.nix +++ b/plugins/languages/markdown/markdown-preview.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "markdown-preview"; originalName = "markdown-preview.nvim"; defaultPackage = pkgs.vimPlugins.markdown-preview-nvim; diff --git a/plugins/languages/nix.nix b/plugins/languages/nix.nix index c9f4414c..49547275 100644 --- a/plugins/languages/nix.nix +++ b/plugins/languages/nix.nix @@ -1,11 +1,10 @@ { - config, lib, helpers, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "nix"; originalName = "vim-nix"; defaultPackage = pkgs.vimPlugins.vim-nix; diff --git a/plugins/languages/parinfer-rust.nix b/plugins/languages/parinfer-rust.nix index e87fba47..8ba12d6f 100644 --- a/plugins/languages/parinfer-rust.nix +++ b/plugins/languages/parinfer-rust.nix @@ -1,11 +1,10 @@ { lib, helpers, - config, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "parinfer-rust"; defaultPackage = pkgs.vimPlugins.parinfer-rust; globalPrefix = "parinfer_"; diff --git a/plugins/languages/tagbar.nix b/plugins/languages/tagbar.nix index 0f65b5fb..db49fd5a 100644 --- a/plugins/languages/tagbar.nix +++ b/plugins/languages/tagbar.nix @@ -1,11 +1,10 @@ { helpers, - config, pkgs, lib, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "tagbar"; defaultPackage = pkgs.vimPlugins.tagbar; globalPrefix = "tagbar_"; diff --git a/plugins/languages/texpresso.nix b/plugins/languages/texpresso.nix index 06e9641f..503cd0f6 100644 --- a/plugins/languages/texpresso.nix +++ b/plugins/languages/texpresso.nix @@ -1,14 +1,13 @@ { lib, helpers, - config, pkgs, ... }: with lib; # This plugin has no configuration, so we use `mkVimPlugin` without the `globalPrefix` argument to # avoid the creation of the `settings` option. -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "texpresso"; originalName = "texpresso.vim"; defaultPackage = pkgs.vimPlugins.texpresso-vim; diff --git a/plugins/languages/typst/typst-vim.nix b/plugins/languages/typst/typst-vim.nix index c9627556..f2bdffac 100644 --- a/plugins/languages/typst/typst-vim.nix +++ b/plugins/languages/typst/typst-vim.nix @@ -1,12 +1,11 @@ { lib, helpers, - config, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "typst-vim"; originalName = "typst.vim"; defaultPackage = pkgs.vimPlugins.typst-vim; diff --git a/plugins/languages/vim-slime.nix b/plugins/languages/vim-slime.nix index 1ac936f8..d145b428 100644 --- a/plugins/languages/vim-slime.nix +++ b/plugins/languages/vim-slime.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "vim-slime"; defaultPackage = pkgs.vimPlugins.vim-slime; globalPrefix = "slime_"; diff --git a/plugins/languages/vimtex.nix b/plugins/languages/vimtex.nix index e931a46b..ef3e6088 100644 --- a/plugins/languages/vimtex.nix +++ b/plugins/languages/vimtex.nix @@ -1,12 +1,11 @@ { lib, helpers, - config, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "vimtex"; defaultPackage = pkgs.vimPlugins.vimtex; globalPrefix = "vimtex_"; diff --git a/plugins/languages/zig.nix b/plugins/languages/zig.nix index b0110026..fdb3efa0 100644 --- a/plugins/languages/zig.nix +++ b/plugins/languages/zig.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "zig"; originalName = "zig.vim"; defaultPackage = pkgs.vimPlugins.zig-vim; diff --git a/plugins/lsp/schemastore.nix b/plugins/lsp/schemastore.nix index 38e540cc..4cc9164c 100644 --- a/plugins/lsp/schemastore.nix +++ b/plugins/lsp/schemastore.nix @@ -6,7 +6,7 @@ ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "schemastore"; originalName = "SchemaStore.nvim"; defaultPackage = pkgs.vimPlugins.SchemaStore-nvim; diff --git a/plugins/statuslines/airline.nix b/plugins/statuslines/airline.nix index 8269136a..75fc9f06 100644 --- a/plugins/statuslines/airline.nix +++ b/plugins/statuslines/airline.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "airline"; originalName = "vim-airline"; defaultPackage = pkgs.vimPlugins.vim-airline; diff --git a/plugins/utils/bufdelete.nix b/plugins/utils/bufdelete.nix index 78c3c264..d97cc2fb 100644 --- a/plugins/utils/bufdelete.nix +++ b/plugins/utils/bufdelete.nix @@ -1,12 +1,11 @@ { - config, helpers, pkgs, lib, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "bufdelete"; originalName = "bufdelete.nvim"; defaultPackage = pkgs.vimPlugins.bufdelete-nvim; diff --git a/plugins/utils/direnv.nix b/plugins/utils/direnv.nix index 50ba975e..0a469f6a 100644 --- a/plugins/utils/direnv.nix +++ b/plugins/utils/direnv.nix @@ -1,12 +1,11 @@ { - config, helpers, pkgs, lib, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "direnv"; originalName = "direnv.vim"; defaultPackage = pkgs.vimPlugins.direnv-vim; diff --git a/plugins/utils/emmet.nix b/plugins/utils/emmet.nix index dccbc4e9..11917dd4 100644 --- a/plugins/utils/emmet.nix +++ b/plugins/utils/emmet.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "emmet"; originalName = "emmet-vim"; defaultPackage = pkgs.vimPlugins.emmet-vim; diff --git a/plugins/utils/endwise.nix b/plugins/utils/endwise.nix index cd25cac2..c5adc9af 100644 --- a/plugins/utils/endwise.nix +++ b/plugins/utils/endwise.nix @@ -1,11 +1,10 @@ { - config, lib, pkgs, helpers, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "endwise"; originalName = "vim-endwise"; defaultPackage = pkgs.vimPlugins.vim-endwise; diff --git a/plugins/utils/goyo.nix b/plugins/utils/goyo.nix index f73fa8cb..b8393c42 100644 --- a/plugins/utils/goyo.nix +++ b/plugins/utils/goyo.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with helpers.vim-plugin; with lib; -mkVimPlugin config { +mkVimPlugin { name = "goyo"; originalName = "goyo.vim"; defaultPackage = pkgs.vimPlugins.goyo-vim; diff --git a/plugins/utils/improved-search.nix b/plugins/utils/improved-search.nix index 9a92941e..32472422 100644 --- a/plugins/utils/improved-search.nix +++ b/plugins/utils/improved-search.nix @@ -1,14 +1,13 @@ { lib, helpers, - config, pkgs, ... }: with lib; # This plugin is only configured through keymaps, so we use `mkVimPlugin` without the # `globalPrefix` argument to avoid the creation of the `settings` option. -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "improved-search"; originalName = "improved-search.nvim"; defaultPackage = pkgs.vimPlugins.improved-search-nvim; diff --git a/plugins/utils/instant.nix b/plugins/utils/instant.nix index 28444516..c137e150 100644 --- a/plugins/utils/instant.nix +++ b/plugins/utils/instant.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "instant"; originalName = "instant.nvim"; defaultPackage = pkgs.vimPlugins.instant-nvim; diff --git a/plugins/utils/magma-nvim.nix b/plugins/utils/magma-nvim.nix index afeb70a1..1533588c 100644 --- a/plugins/utils/magma-nvim.nix +++ b/plugins/utils/magma-nvim.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "magma-nvim"; originalName = "magma-nvim"; defaultPackage = pkgs.vimPlugins.magma-nvim-goose; diff --git a/plugins/utils/molten.nix b/plugins/utils/molten.nix index 8a07722c..d02a08c2 100644 --- a/plugins/utils/molten.nix +++ b/plugins/utils/molten.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "molten"; originalName = "molten-nvim"; defaultPackage = pkgs.vimPlugins.molten-nvim; diff --git a/plugins/utils/sandwich.nix b/plugins/utils/sandwich.nix index 32618364..c247db57 100644 --- a/plugins/utils/sandwich.nix +++ b/plugins/utils/sandwich.nix @@ -1,12 +1,11 @@ { lib, - config, helpers, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "sandwich"; originalName = "vim-sandwich"; defaultPackage = pkgs.vimPlugins.vim-sandwich; diff --git a/plugins/utils/sleuth.nix b/plugins/utils/sleuth.nix index 49700e3f..8765783e 100644 --- a/plugins/utils/sleuth.nix +++ b/plugins/utils/sleuth.nix @@ -1,11 +1,10 @@ { - config, lib, helpers, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "sleuth"; originalName = "vim-sleuth"; defaultPackage = pkgs.vimPlugins.vim-sleuth; diff --git a/plugins/utils/startify/default.nix b/plugins/utils/startify/default.nix index 028d54ef..ccb0de4c 100644 --- a/plugins/utils/startify/default.nix +++ b/plugins/utils/startify/default.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "startify"; originalName = "vim-startify"; defaultPackage = pkgs.vimPlugins.vim-startify; diff --git a/plugins/utils/surround.nix b/plugins/utils/surround.nix index 98dbeb22..14879277 100644 --- a/plugins/utils/surround.nix +++ b/plugins/utils/surround.nix @@ -1,11 +1,10 @@ { - config, lib, helpers, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "surround"; originalName = "surround.vim"; defaultPackage = pkgs.vimPlugins.vim-surround; diff --git a/plugins/utils/tmux-navigator.nix b/plugins/utils/tmux-navigator.nix index 05b0583a..1ae542ed 100644 --- a/plugins/utils/tmux-navigator.nix +++ b/plugins/utils/tmux-navigator.nix @@ -1,12 +1,11 @@ { lib, helpers, - config, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "tmux-navigator"; originalName = "vim-tmux-navigator"; defaultPackage = pkgs.vimPlugins.vim-tmux-navigator; diff --git a/plugins/utils/undotree.nix b/plugins/utils/undotree.nix index 08cda993..2f4501a8 100644 --- a/plugins/utils/undotree.nix +++ b/plugins/utils/undotree.nix @@ -1,13 +1,12 @@ { lib, - config, helpers, pkgs, ... }: with lib; with helpers.vim-plugin; -mkVimPlugin config { +mkVimPlugin { name = "undotree"; defaultPackage = pkgs.vimPlugins.undotree; globalPrefix = "undotree_"; diff --git a/plugins/utils/vim-css-color.nix b/plugins/utils/vim-css-color.nix index 772a3916..95a6639b 100644 --- a/plugins/utils/vim-css-color.nix +++ b/plugins/utils/vim-css-color.nix @@ -1,10 +1,9 @@ { - config, helpers, pkgs, ... }: -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "vim-css-color"; defaultPackage = pkgs.vimPlugins.vim-css-color; diff --git a/plugins/utils/wakatime.nix b/plugins/utils/wakatime.nix index d3a0a5d3..449dafb8 100644 --- a/plugins/utils/wakatime.nix +++ b/plugins/utils/wakatime.nix @@ -1,12 +1,11 @@ { lib, helpers, - config, pkgs, ... }: with lib; -helpers.vim-plugin.mkVimPlugin config { +helpers.vim-plugin.mkVimPlugin { name = "wakatime"; originalName = "vim-wakatime"; defaultPackage = pkgs.vimPlugins.vim-wakatime;