From 78e295fa419801efb56a384e37987c25a618f21f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 15 Dec 2024 20:28:52 +0100
Subject: [PATCH] treewide (cleaning): helpers.vim-plugin ->
 lib.nixvim.vim-plugin

---
 plugins/by-name/bufdelete/default.nix                  | 2 +-
 plugins/by-name/codeium-vim/default.nix                | 2 +-
 plugins/by-name/commentary/default.nix                 | 2 +-
 plugins/by-name/copilot-vim/default.nix                | 4 ++--
 plugins/by-name/emmet/default.nix                      | 2 +-
 plugins/by-name/endwise/default.nix                    | 2 +-
 plugins/by-name/fugitive/default.nix                   | 2 +-
 plugins/by-name/gitignore/default.nix                  | 2 +-
 plugins/by-name/godot/default.nix                      | 2 +-
 plugins/by-name/goyo/default.nix                       | 2 +-
 plugins/by-name/haskell-scope-highlighting/default.nix | 2 +-
 plugins/by-name/helm/default.nix                       | 2 +-
 plugins/by-name/improved-search/default.nix            | 2 +-
 plugins/by-name/instant/default.nix                    | 2 +-
 plugins/by-name/julia-cell/default.nix                 | 2 +-
 plugins/by-name/ledger/default.nix                     | 2 +-
 plugins/by-name/magma-nvim/default.nix                 | 2 +-
 plugins/by-name/markdown-preview/default.nix           | 2 +-
 plugins/by-name/molten/default.nix                     | 2 +-
 plugins/by-name/nix/default.nix                        | 2 +-
 plugins/by-name/parinfer-rust/default.nix              | 2 +-
 plugins/by-name/sandwich/default.nix                   | 2 +-
 plugins/by-name/schemastore/default.nix                | 2 +-
 plugins/by-name/sleuth/default.nix                     | 2 +-
 plugins/by-name/startify/default.nix                   | 2 +-
 plugins/by-name/tagbar/default.nix                     | 2 +-
 plugins/by-name/texpresso/default.nix                  | 2 +-
 plugins/by-name/tmux-navigator/default.nix             | 2 +-
 plugins/by-name/typst-vim/default.nix                  | 2 +-
 plugins/by-name/undotree/default.nix                   | 2 +-
 plugins/by-name/vim-slime/default.nix                  | 2 +-
 plugins/by-name/vim-surround/default.nix               | 2 +-
 plugins/by-name/vimtex/default.nix                     | 2 +-
 plugins/by-name/wakatime/default.nix                   | 2 +-
 plugins/by-name/zig/default.nix                        | 2 +-
 35 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/plugins/by-name/bufdelete/default.nix b/plugins/by-name/bufdelete/default.nix
index ef9b7642..252f8d3a 100644
--- a/plugins/by-name/bufdelete/default.nix
+++ b/plugins/by-name/bufdelete/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "bufdelete";
   packPathName = "bufdelete.nvim";
   package = "bufdelete-nvim";
diff --git a/plugins/by-name/codeium-vim/default.nix b/plugins/by-name/codeium-vim/default.nix
index 447df925..41d1dd3e 100644
--- a/plugins/by-name/codeium-vim/default.nix
+++ b/plugins/by-name/codeium-vim/default.nix
@@ -34,7 +34,7 @@ let
     };
   };
 in
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "codeium-vim";
   packPathName = "codeium.vim";
   globalPrefix = "codeium_";
diff --git a/plugins/by-name/commentary/default.nix b/plugins/by-name/commentary/default.nix
index 6073257b..ead3134d 100644
--- a/plugins/by-name/commentary/default.nix
+++ b/plugins/by-name/commentary/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "commentary";
   packPathName = "vim-commentary";
   package = "vim-commentary";
diff --git a/plugins/by-name/copilot-vim/default.nix b/plugins/by-name/copilot-vim/default.nix
index d09dd488..c3c829a8 100644
--- a/plugins/by-name/copilot-vim/default.nix
+++ b/plugins/by-name/copilot-vim/default.nix
@@ -5,8 +5,8 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
-helpers.vim-plugin.mkVimPlugin {
+with lib.nixvim.vim-plugin;
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "copilot-vim";
   packPathName = "copilot.vim";
   globalPrefix = "copilot_";
diff --git a/plugins/by-name/emmet/default.nix b/plugins/by-name/emmet/default.nix
index 8aaa8da3..d0a5c527 100644
--- a/plugins/by-name/emmet/default.nix
+++ b/plugins/by-name/emmet/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "emmet";
   packPathName = "emmet-vim";
diff --git a/plugins/by-name/endwise/default.nix b/plugins/by-name/endwise/default.nix
index 43b4ae60..8ebee451 100644
--- a/plugins/by-name/endwise/default.nix
+++ b/plugins/by-name/endwise/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "endwise";
   packPathName = "vim-endwise";
   package = "vim-endwise";
diff --git a/plugins/by-name/fugitive/default.nix b/plugins/by-name/fugitive/default.nix
index 9e2333a4..d2397237 100644
--- a/plugins/by-name/fugitive/default.nix
+++ b/plugins/by-name/fugitive/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "fugitive";
   packPathName = "vim-fugitive";
   package = "vim-fugitive";
diff --git a/plugins/by-name/gitignore/default.nix b/plugins/by-name/gitignore/default.nix
index 7ae44c48..fea652de 100644
--- a/plugins/by-name/gitignore/default.nix
+++ b/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).
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "gitignore";
   packPathName = "gitignore.nvim";
   package = "gitignore-nvim";
diff --git a/plugins/by-name/godot/default.nix b/plugins/by-name/godot/default.nix
index e42c1a33..70dff75e 100644
--- a/plugins/by-name/godot/default.nix
+++ b/plugins/by-name/godot/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "godot";
   packPathName = "vim-godot";
   package = "vim-godot";
diff --git a/plugins/by-name/goyo/default.nix b/plugins/by-name/goyo/default.nix
index 9adac851..401c1f74 100644
--- a/plugins/by-name/goyo/default.nix
+++ b/plugins/by-name/goyo/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 with lib;
 mkVimPlugin {
   name = "goyo";
diff --git a/plugins/by-name/haskell-scope-highlighting/default.nix b/plugins/by-name/haskell-scope-highlighting/default.nix
index f2a3f77f..ea3a6a72 100644
--- a/plugins/by-name/haskell-scope-highlighting/default.nix
+++ b/plugins/by-name/haskell-scope-highlighting/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "haskell-scope-highlighting";
   packPathName = "haskell-scope-highlighting.nvim";
   package = "haskell-scope-highlighting-nvim";
diff --git a/plugins/by-name/helm/default.nix b/plugins/by-name/helm/default.nix
index 9176605d..b464b24c 100644
--- a/plugins/by-name/helm/default.nix
+++ b/plugins/by-name/helm/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "helm";
   packPathName = "vim-helm";
   package = "vim-helm";
diff --git a/plugins/by-name/improved-search/default.nix b/plugins/by-name/improved-search/default.nix
index 922b6a49..425ba6c1 100644
--- a/plugins/by-name/improved-search/default.nix
+++ b/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.
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "improved-search";
   packPathName = "improved-search.nvim";
   package = "improved-search-nvim";
diff --git a/plugins/by-name/instant/default.nix b/plugins/by-name/instant/default.nix
index d1dd5729..508e6821 100644
--- a/plugins/by-name/instant/default.nix
+++ b/plugins/by-name/instant/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "instant";
   packPathName = "instant.nvim";
diff --git a/plugins/by-name/julia-cell/default.nix b/plugins/by-name/julia-cell/default.nix
index 23b9cb18..c0ea2441 100644
--- a/plugins/by-name/julia-cell/default.nix
+++ b/plugins/by-name/julia-cell/default.nix
@@ -35,7 +35,7 @@ let
   };
 in
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "julia-cell";
   packPathName = "vim-julia-cell";
   package = "vim-julia-cell";
diff --git a/plugins/by-name/ledger/default.nix b/plugins/by-name/ledger/default.nix
index f0561d9b..e8a1c2fe 100644
--- a/plugins/by-name/ledger/default.nix
+++ b/plugins/by-name/ledger/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "ledger";
   packPathName = "vim-ledger";
diff --git a/plugins/by-name/magma-nvim/default.nix b/plugins/by-name/magma-nvim/default.nix
index 10697c1b..2151c36e 100644
--- a/plugins/by-name/magma-nvim/default.nix
+++ b/plugins/by-name/magma-nvim/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "magma-nvim";
   packPathName = "magma-nvim";
diff --git a/plugins/by-name/markdown-preview/default.nix b/plugins/by-name/markdown-preview/default.nix
index 2806f826..94decf5b 100644
--- a/plugins/by-name/markdown-preview/default.nix
+++ b/plugins/by-name/markdown-preview/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "markdown-preview";
   packPathName = "markdown-preview.nvim";
diff --git a/plugins/by-name/molten/default.nix b/plugins/by-name/molten/default.nix
index edfd0523..63421dfb 100644
--- a/plugins/by-name/molten/default.nix
+++ b/plugins/by-name/molten/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "molten";
   packPathName = "molten-nvim";
diff --git a/plugins/by-name/nix/default.nix b/plugins/by-name/nix/default.nix
index db7753bf..7e83e6aa 100644
--- a/plugins/by-name/nix/default.nix
+++ b/plugins/by-name/nix/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "nix";
   packPathName = "vim-nix";
   package = "vim-nix";
diff --git a/plugins/by-name/parinfer-rust/default.nix b/plugins/by-name/parinfer-rust/default.nix
index 60f99bdc..187af015 100644
--- a/plugins/by-name/parinfer-rust/default.nix
+++ b/plugins/by-name/parinfer-rust/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "parinfer-rust";
   globalPrefix = "parinfer_";
 
diff --git a/plugins/by-name/sandwich/default.nix b/plugins/by-name/sandwich/default.nix
index 72146466..e4fb3318 100644
--- a/plugins/by-name/sandwich/default.nix
+++ b/plugins/by-name/sandwich/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "sandwich";
   packPathName = "vim-sandwich";
   package = "vim-sandwich";
diff --git a/plugins/by-name/schemastore/default.nix b/plugins/by-name/schemastore/default.nix
index 21ff7efe..df10aac4 100644
--- a/plugins/by-name/schemastore/default.nix
+++ b/plugins/by-name/schemastore/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "schemastore";
   packPathName = "SchemaStore.nvim";
   package = "SchemaStore-nvim";
diff --git a/plugins/by-name/sleuth/default.nix b/plugins/by-name/sleuth/default.nix
index 3c86753f..c7866f74 100644
--- a/plugins/by-name/sleuth/default.nix
+++ b/plugins/by-name/sleuth/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "sleuth";
   packPathName = "vim-sleuth";
   package = "vim-sleuth";
diff --git a/plugins/by-name/startify/default.nix b/plugins/by-name/startify/default.nix
index fa22c8d5..9fa27a36 100644
--- a/plugins/by-name/startify/default.nix
+++ b/plugins/by-name/startify/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "startify";
   packPathName = "vim-startify";
diff --git a/plugins/by-name/tagbar/default.nix b/plugins/by-name/tagbar/default.nix
index 4d1a2f81..a4993210 100644
--- a/plugins/by-name/tagbar/default.nix
+++ b/plugins/by-name/tagbar/default.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "tagbar";
   globalPrefix = "tagbar_";
 
diff --git a/plugins/by-name/texpresso/default.nix b/plugins/by-name/texpresso/default.nix
index ec72f55f..6719abda 100644
--- a/plugins/by-name/texpresso/default.nix
+++ b/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.
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "texpresso";
   packPathName = "texpresso.vim";
   package = "texpresso-vim";
diff --git a/plugins/by-name/tmux-navigator/default.nix b/plugins/by-name/tmux-navigator/default.nix
index 8caed49e..b25b32ba 100644
--- a/plugins/by-name/tmux-navigator/default.nix
+++ b/plugins/by-name/tmux-navigator/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "tmux-navigator";
   packPathName = "vim-tmux-navigator";
   package = "vim-tmux-navigator";
diff --git a/plugins/by-name/typst-vim/default.nix b/plugins/by-name/typst-vim/default.nix
index a701c0bd..604d57c1 100644
--- a/plugins/by-name/typst-vim/default.nix
+++ b/plugins/by-name/typst-vim/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "typst-vim";
   packPathName = "typst.vim";
   globalPrefix = "typst_";
diff --git a/plugins/by-name/undotree/default.nix b/plugins/by-name/undotree/default.nix
index 74cf7cdb..287a5ce4 100644
--- a/plugins/by-name/undotree/default.nix
+++ b/plugins/by-name/undotree/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "undotree";
   globalPrefix = "undotree_";
diff --git a/plugins/by-name/vim-slime/default.nix b/plugins/by-name/vim-slime/default.nix
index b1e923e5..4f3de0b1 100644
--- a/plugins/by-name/vim-slime/default.nix
+++ b/plugins/by-name/vim-slime/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "vim-slime";
   globalPrefix = "slime_";
diff --git a/plugins/by-name/vim-surround/default.nix b/plugins/by-name/vim-surround/default.nix
index 4e07c4e7..5997a0c0 100644
--- a/plugins/by-name/vim-surround/default.nix
+++ b/plugins/by-name/vim-surround/default.nix
@@ -3,7 +3,7 @@
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "vim-surround";
   packPathName = "surround.vim";
   package = "vim-surround";
diff --git a/plugins/by-name/vimtex/default.nix b/plugins/by-name/vimtex/default.nix
index 2e6e7cb8..f594d699 100644
--- a/plugins/by-name/vimtex/default.nix
+++ b/plugins/by-name/vimtex/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "vimtex";
   globalPrefix = "vimtex_";
 
diff --git a/plugins/by-name/wakatime/default.nix b/plugins/by-name/wakatime/default.nix
index d5b338c6..bd660c52 100644
--- a/plugins/by-name/wakatime/default.nix
+++ b/plugins/by-name/wakatime/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "wakatime";
   packPathName = "vim-wakatime";
   package = "vim-wakatime";
diff --git a/plugins/by-name/zig/default.nix b/plugins/by-name/zig/default.nix
index 737803ab..cb8ef436 100644
--- a/plugins/by-name/zig/default.nix
+++ b/plugins/by-name/zig/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib;
-with helpers.vim-plugin;
+with lib.nixvim.vim-plugin;
 mkVimPlugin {
   name = "zig";
   packPathName = "zig.vim";