misc: refactor helpers propagation

Co-authored-by: Robert Hensing <robert@roberthensing.nl>

flake-modules/default.nix

@@ -1,6 +1,7 @@
 {inputs, ...}: {
   imports = [
     ./dev.nix
+    ./helpers.nix
     ./lib.nix
     ./legacy-packages.nix
     ./modules.nix

flake-modules/helpers.nix

@@ -0,0 +1,15 @@
+{getHelpers, ...}: {
+  _module.args.getHelpers = pkgs:
+    import ../lib/helpers.nix {
+      inherit pkgs;
+      inherit (pkgs) lib;
+    };
+
+  perSystem = {
+    pkgs,
+    config,
+    ...
+  }: {
+    _module.args.helpers = getHelpers pkgs;
+  };
+}

flake-modules/modules.nix

@@ -10,7 +10,6 @@
           _module.args = {
             pkgs = pkgs.lib.mkForce pkgs;
             inherit (pkgs) lib;
-            helpers = import ../lib/helpers.nix {inherit (pkgs) lib;};
           };
         };
       };

flake-modules/packages.nix

@@ -3,10 +3,11 @@
     pkgs,
     config,
     rawModules,
+    helpers,
     ...
   }: {
     packages = import ../docs {
-      inherit rawModules pkgs;
+      inherit rawModules pkgs helpers;
     };
 
     # Test that all packages build fine when running `nix flake check`.

flake-modules/wrappers.nix

@@ -1,12 +1,14 @@
 {
   inputs,
   modules,
+  getHelpers,
   self,
   ...
 }: let
   wrapperArgs = {
     inherit modules;
     inherit self;
+    inherit getHelpers;
   };
 in {
   perSystem = {