diff --git a/lib/deprecation.nix b/lib/deprecation.nix
index 1de8396c..51bc63b9 100644
--- a/lib/deprecation.nix
+++ b/lib/deprecation.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib }:
 with lib;
 rec {
   # Get a (sub)option by walking the path,
diff --git a/lib/helpers.nix b/lib/helpers.nix
index b2ad7917..a56cfc9a 100644
--- a/lib/helpers.nix
+++ b/lib/helpers.nix
@@ -5,21 +5,24 @@
   ...
 }:
 let
+  # Used when importing parts of helpers
+  call = lib.callPackageWith { inherit pkgs lib helpers; };
+
   # Build helpers recursively
   helpers =
     {
-      autocmd = import ./autocmd-helpers.nix { inherit lib helpers; };
-      keymaps = import ./keymap-helpers.nix { inherit lib helpers; };
-      lua = import ./to-lua.nix { inherit lib; };
+      autocmd = call ./autocmd-helpers.nix { };
+      keymaps = call ./keymap-helpers.nix { };
+      lua = call ./to-lua.nix { };
       toLuaObject = helpers.lua.toLua;
       maintainers = import ./maintainers.nix;
-      neovim-plugin = import ./neovim-plugin.nix { inherit lib helpers; };
-      nixvimTypes = import ./types.nix { inherit lib helpers; };
-      vim-plugin = import ./vim-plugin.nix { inherit lib helpers; };
+      neovim-plugin = call ./neovim-plugin.nix { };
+      nixvimTypes = call ./types.nix { };
+      vim-plugin = call ./vim-plugin.nix { };
     }
-    // import ./builders.nix { inherit lib pkgs; }
-    // import ./deprecation.nix { inherit lib; }
-    // import ./options.nix { inherit lib helpers; }
-    // import ./utils.nix { inherit lib helpers _nixvimTests; };
+    // call ./builders.nix { }
+    // call ./deprecation.nix { }
+    // call ./options.nix { }
+    // call ./utils.nix { inherit _nixvimTests; };
 in
 helpers
diff --git a/lib/types.nix b/lib/types.nix
index dcc43e8e..d2b20251 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1,4 +1,4 @@
-{ lib, helpers, ... }:
+{ lib, helpers }:
 with lib;
 with helpers;
 with lib.types;