wrappers: bootstrap "helpers" directly

We don't need to pass a `getHelpers` function in, since we can just
import `../lib/helpers.nix`.

flake-modules/wrappers.nix

@@ -1,21 +1,10 @@
-{
+{ inputs, self, ... }:
-  inputs,
-  getHelpers,
-  self,
-  ...
-}:
-let
-  wrapperArgs = {
-    inherit self;
-    inherit getHelpers;
-  };
-in
 {
   perSystem =
     { system, pkgs, ... }:
     {
       _module.args = {
-        makeNixvimWithModule = import ../wrappers/standalone.nix pkgs wrapperArgs;
+        makeNixvimWithModule = import ../wrappers/standalone.nix pkgs self;
       };
 
       checks =
@@ -47,15 +36,15 @@ in
 
   flake = {
     nixosModules = {
-      nixvim = import ../wrappers/nixos.nix wrapperArgs;
+      nixvim = import ../wrappers/nixos.nix self;
       default = self.nixosModules.nixvim;
     };
     homeManagerModules = {
-      nixvim = import ../wrappers/hm.nix wrapperArgs;
+      nixvim = import ../wrappers/hm.nix self;
       default = self.homeManagerModules.nixvim;
     };
     nixDarwinModules = {
-      nixvim = import ../wrappers/darwin.nix wrapperArgs;
+      nixvim = import ../wrappers/darwin.nix self;
       default = self.nixDarwinModules.nixvim;
     };
   };

lib/helpers.nix

@@ -1,7 +1,7 @@
 {
-  lib,
   pkgs,
-  _nixvimTests,
+  lib ? pkgs.lib,
+  _nixvimTests ? false,
   ...
 }:
 let

wrappers/_shared.nix

@@ -1,6 +1,4 @@
 {
-  # Our helpers
-  helpers,
   # Option path where extraFiles should go
   filesOpt ? null,
   # Filepath prefix to apply to extraFiles
@@ -9,7 +7,12 @@
   # Is prefixed with `filesPrefix`
   initName ? "init.lua",
 }:
-{ lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 let
   inherit (lib)
     isAttrs
@@ -39,7 +42,7 @@ in
 
   config = mkMerge [
     # Make our lib available to the host modules
-    { nixvim.helpers = lib.mkDefault helpers; }
+    { nixvim.helpers = lib.mkDefault (import ../lib/helpers.nix { inherit pkgs lib; }); }
     # Propagate extraFiles to the host modules
     (optionalAttrs (filesOpt != null) (
       mkIf (!cfg.wrapRc) (

wrappers/darwin.nix

@@ -1,4 +1,4 @@
-{ self, getHelpers }:
+self:
 {
   pkgs,
   config,
@@ -15,7 +15,6 @@ let
     mkIf
     types
     ;
-  helpers = getHelpers pkgs false;
   cfg = config.programs.nixvim;
 in
 {
@@ -27,7 +26,7 @@ in
         specialArgs = {
           darwinConfig = config;
           defaultPkgs = pkgs;
-          inherit helpers;
+          inherit (config.nixvim) helpers;
         };
         modules = [
           ./modules/darwin.nix
@@ -37,7 +36,7 @@ in
     };
   };
 
-  imports = [ (import ./_shared.nix { inherit helpers; }) ];
+  imports = [ (import ./_shared.nix { }) ];
 
   config = mkIf cfg.enable (mkMerge [
     {

wrappers/hm.nix

@@ -1,4 +1,4 @@
-{ self, getHelpers }:
+self:
 {
   pkgs,
   config,
@@ -14,7 +14,6 @@ let
     mkIf
     types
     ;
-  helpers = getHelpers pkgs false;
   cfg = config.programs.nixvim;
 in
 {
@@ -26,7 +25,7 @@ in
         specialArgs = {
           hmConfig = config;
           defaultPkgs = pkgs;
-          inherit helpers;
+          inherit (config.nixvim) helpers;
         };
         modules = [
           ./modules/hm.nix
@@ -38,7 +37,6 @@ in
 
   imports = [
     (import ./_shared.nix {
-      inherit helpers;
       filesOpt = [
         "xdg"
         "configFile"

wrappers/nixos.nix

@@ -1,4 +1,4 @@
-{ self, getHelpers }:
+self:
 {
   pkgs,
   config,
@@ -15,7 +15,6 @@ let
     mkIf
     types
     ;
-  helpers = getHelpers pkgs false;
   cfg = config.programs.nixvim;
 in
 {
@@ -27,7 +26,7 @@ in
         specialArgs = {
           nixosConfig = config;
           defaultPkgs = pkgs;
-          inherit helpers;
+          inherit (config.nixvim) helpers;
         };
         modules = [
           ./modules/nixos.nix
@@ -39,7 +38,6 @@ in
 
   imports = [
     (import ./_shared.nix {
-      inherit helpers;
       filesOpt = [
         "environment"
         "etc"

wrappers/standalone.nix

@@ -1,5 +1,4 @@
-default_pkgs:
+default_pkgs: self:
-{ self, getHelpers }:
 {
   pkgs ? default_pkgs,
   extraSpecialArgs ? { },
@@ -9,7 +8,7 @@ default_pkgs:
 let
   inherit (pkgs) lib;
 
-  helpers = getHelpers pkgs _nixvimTests;
+  helpers = import ../lib/helpers.nix { inherit pkgs lib _nixvimTests; };
 
   handleAssertions =
     config: