treewide: vim-plugin -> plugins

CONTRIBUTING.md

@@ -41,7 +41,7 @@ To add a new plugin you need to do the following.
 2. The vast majority of plugins fall into one of those two categories:
 
 - _vim plugins_: They are configured through **global variables** (`g:plugin_foo_option` in vimscript and `vim.g.plugin_foo_option` in lua).\
-  For those, you should use the `lib.nixvim.vim-plugin.mkVimPlugin`.\
+  For those, you should use the `lib.nixvim.plugins.mkVimPlugin`.\
   -> See [this plugin](plugins/utils/direnv.nix) for an example.
 - _neovim plugins_: They are configured through a `setup` function (`require('plugin').setup({opts})`).\
   For those, you should use the `lib.nixvim.plugins.mkNeovimPlugin`.\

plugins/by-name/airline/default.nix

@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "airline";
   packPathName = "vim-airline";
   package = "vim-airline";

plugins/by-name/autosource/default.nix

@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "autosource";
   packPathName = "vim-autosource";
   package = "vim-autosource";

plugins/by-name/bufdelete/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "bufdelete";
   packPathName = "bufdelete.nvim";
   package = "bufdelete-nvim";

plugins/by-name/codeium-vim/default.nix

@@ -34,7 +34,7 @@ let
     };
   };
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "codeium-vim";
   packPathName = "codeium.vim";
   globalPrefix = "codeium_";

plugins/by-name/commentary/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "commentary";
   packPathName = "vim-commentary";
   package = "vim-commentary";

plugins/by-name/committia/default.nix

@@ -6,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "committia";
   packPathName = "committia.vim";
   package = "committia-vim";

plugins/by-name/conjure/default.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "conjure";
 
   maintainers = [ lib.maintainers.GaetanLepage ];

plugins/by-name/copilot-vim/default.nix

@@ -5,8 +5,8 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
-lib.nixvim.vim-plugin.mkVimPlugin {
+with lib.nixvim.plugins;
+lib.nixvim.plugins.mkVimPlugin {
   name = "copilot-vim";
   packPathName = "copilot.vim";
   globalPrefix = "copilot_";

plugins/by-name/direnv/default.nix

@@ -6,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "direnv";
   packPathName = "direnv.vim";
   package = "direnv-vim";

plugins/by-name/earthly/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "earthly";
   packPathName = "earthly.vim";
   package = "earthly-vim";

plugins/by-name/easyescape/default.nix

@@ -6,7 +6,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "easyescape";
   packPathName = "vim-easyescape";
   package = "vim-easyescape";

plugins/by-name/emmet/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "emmet";
   packPathName = "emmet-vim";

plugins/by-name/endwise/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "endwise";
   packPathName = "vim-endwise";
   package = "vim-endwise";

plugins/by-name/floaterm/default.nix

@@ -6,7 +6,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrStr;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "floaterm";
   packPathName = "vim-floaterm";
   package = "vim-floaterm";

plugins/by-name/friendly-snippets/default.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "friendly-snippets";
 
   maintainers = [ lib.maintainers.GaetanLepage ];

plugins/by-name/fugitive/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "fugitive";
   packPathName = "vim-fugitive";
   package = "vim-fugitive";

plugins/by-name/gitgutter/default.nix

@@ -7,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "gitgutter";
   packPathName = "vim-gitgutter";
   package = "vim-gitgutter";

plugins/by-name/gitignore/default.nix

@@ -6,7 +6,7 @@
 with lib;
 # We use `mkVimPlugin` to avoid having a `settings` option.
 # Indeed, this plugin is not configurable in the common sense (no `setup` function).
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "gitignore";
   packPathName = "gitignore.nvim";
   package = "gitignore-nvim";

plugins/by-name/gitmessenger/default.nix

@@ -7,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "gitmessenger";
   packPathName = "git-messenger.vim";
   package = "git-messenger-vim";

plugins/by-name/godot/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "godot";
   packPathName = "vim-godot";
   package = "vim-godot";

plugins/by-name/goyo/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 with lib;
 mkVimPlugin {
   name = "goyo";

plugins/by-name/haskell-scope-highlighting/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "haskell-scope-highlighting";
   packPathName = "haskell-scope-highlighting.nvim";
   package = "haskell-scope-highlighting-nvim";

plugins/by-name/helm/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "helm";
   packPathName = "vim-helm";
   package = "vim-helm";

plugins/by-name/improved-search/default.nix

@@ -6,7 +6,7 @@
 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.
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "improved-search";
   packPathName = "improved-search.nvim";
   package = "improved-search-nvim";

plugins/by-name/instant/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "instant";
   packPathName = "instant.nvim";

plugins/by-name/intellitab/default.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "intellitab";
   packPathName = "intellitab.nvim";
   package = "intellitab-nvim";

plugins/by-name/julia-cell/default.nix

@@ -35,7 +35,7 @@ let
   };
 in
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "julia-cell";
   packPathName = "vim-julia-cell";
   package = "vim-julia-cell";

plugins/by-name/lazygit/default.nix

@@ -7,7 +7,7 @@ let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "lazygit";
   packPathName = "lazygit.nvim";
   package = "lazygit-nvim";

plugins/by-name/ledger/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "ledger";
   packPathName = "vim-ledger";

plugins/by-name/magma-nvim/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "magma-nvim";
   packPathName = "magma-nvim";

plugins/by-name/markdown-preview/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "markdown-preview";
   packPathName = "markdown-preview.nvim";

plugins/by-name/molten/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "molten";
   packPathName = "molten-nvim";

plugins/by-name/nabla/default.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "nabla";
   packPathName = "nabla.nvim";
   package = "nabla-nvim";

plugins/by-name/nix/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "nix";
   packPathName = "vim-nix";
   package = "vim-nix";

plugins/by-name/numbertoggle/default.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "numbertoggle";
   packPathName = "vim-numbertoggle";
   package = "vim-numbertoggle";

plugins/by-name/openscad/default.nix

@@ -7,7 +7,7 @@
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts applyPrefixToAttrs;
-  inherit (lib.nixvim.vim-plugin) mkSettingsOptionDescription;
+  inherit (lib.nixvim.plugins.vim) mkSettingsOptionDescription;
 
   name = "openscad";
   globalPrefix = "openscad_";

plugins/by-name/parinfer-rust/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "parinfer-rust";
   globalPrefix = "parinfer_";
 

plugins/by-name/plantuml-syntax/default.nix

@@ -6,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "plantuml-syntax";
   globalPrefix = "plantuml_";
 

plugins/by-name/quickmath/default.nix

@@ -5,7 +5,7 @@
 let
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "quickmath";
   packPathName = "quickmath.nvim";
   package = "quickmath-nvim";

plugins/by-name/repeat/default.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "repeat";
   packPathName = "vim-repeat";
   package = "vim-repeat";

plugins/by-name/sandwich/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "sandwich";
   packPathName = "vim-sandwich";
   package = "vim-sandwich";

plugins/by-name/schemastore/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "schemastore";
   packPathName = "SchemaStore.nvim";
   package = "SchemaStore-nvim";

plugins/by-name/scrollview/default.nix

@@ -3,7 +3,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrStr mkNullOrOption;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "scrollview";
   packPathName = "nvim-scrollview";
   package = "nvim-scrollview";

plugins/by-name/sleuth/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "sleuth";
   packPathName = "vim-sleuth";
   package = "vim-sleuth";

plugins/by-name/startify/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "startify";
   packPathName = "vim-startify";

plugins/by-name/tagbar/default.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "tagbar";
   globalPrefix = "tagbar_";
 

plugins/by-name/texpresso/default.nix

@@ -7,7 +7,7 @@
 with lib;
 # This plugin has no configuration, so we use `mkVimPlugin` without the `globalPrefix` argument to
 # avoid the creation of the `settings` option.
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "texpresso";
   packPathName = "texpresso.vim";
   package = "texpresso-vim";

plugins/by-name/tmux-navigator/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "tmux-navigator";
   packPathName = "vim-tmux-navigator";
   package = "vim-tmux-navigator";

plugins/by-name/typst-vim/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "typst-vim";
   packPathName = "typst.vim";
   globalPrefix = "typst_";

plugins/by-name/undotree/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "undotree";
   globalPrefix = "undotree_";

plugins/by-name/vim-bbye/default.nix

@@ -6,7 +6,7 @@ let
   inherit (lib.nixvim) mkNullOrOption;
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-bbye";
 
   maintainers = [ lib.maintainers.GaetanLepage ];

plugins/by-name/vim-colemak/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-colemak";
   maintainers = [ lib.maintainers.kalbasit ];
 }

plugins/by-name/vim-css-color/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-css-color";
   maintainers = [ lib.maintainers.DanielLaing ];
 }

plugins/by-name/vim-dadbod-completion/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-dadbod-completion";
   maintainers = [ lib.maintainers.BoneyPatel ];
   imports = [

plugins/by-name/vim-dadbod-ui/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-dadbod-ui";
   maintainers = [ lib.maintainers.BoneyPatel ];
 }

plugins/by-name/vim-dadbod/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-dadbod";
   maintainers = [ lib.maintainers.BoneyPatel ];
 }

plugins/by-name/vim-matchup/default.nix

@@ -7,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrStr';
   inherit (lib) types;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-matchup";
   globalPrefix = "matchup_";
 

plugins/by-name/vim-slime/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "vim-slime";
   globalPrefix = "slime_";

plugins/by-name/vim-suda/default.nix

@@ -1,6 +1,6 @@
 { lib, helpers, ... }:
 
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-suda";
   globalPrefix = "suda#";
   maintainers = [ lib.maintainers.marcel ];

plugins/by-name/vim-surround/default.nix

@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vim-surround";
   packPathName = "surround.vim";
   package = "vim-surround";

plugins/by-name/vimtex/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "vimtex";
   globalPrefix = "vimtex_";
 

plugins/by-name/wakatime/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "wakatime";
   packPathName = "vim-wakatime";
   package = "vim-wakatime";

plugins/by-name/zig/default.nix

@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with lib.nixvim.vim-plugin;
+with lib.nixvim.plugins;
 mkVimPlugin {
   name = "zig";
   packPathName = "zig.vim";

plugins/cmp/sources/_mk-cmp-plugin.nix

@@ -14,7 +14,7 @@
   imports ? [ ],
   ...
 }@args:
-lib.nixvim.vim-plugin.mkVimPlugin (
+lib.nixvim.plugins.mkVimPlugin (
   builtins.removeAttrs args [
     "pluginName"
     "sourceName"

plugins/colorschemes/dracula.nix

@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "dracula";
   package = "dracula-vim";
   isColorscheme = true;

plugins/colorschemes/everforest.nix

@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "everforest";
   isColorscheme = true;
   globalPrefix = "everforest_";

plugins/colorschemes/melange.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "melange";
   isColorscheme = true;
   packPathName = "melange-nvim";

plugins/colorschemes/nord.nix

@@ -5,7 +5,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "nord";
   isColorscheme = true;
   packPathName = "nord.nvim";

plugins/colorschemes/one.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "one";
   isColorscheme = true;
   packPathName = "vim-one";

plugins/colorschemes/oxocarbon.nix

@@ -2,7 +2,7 @@
   lib,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "oxocarbon";
   isColorscheme = true;
   packPathName = "oxocarbon.nvim";