lib/default.nix: Refactor lib loading

flake.nix

@@ -26,7 +26,8 @@
     };
   };
   outputs = { self, agenix, nixpkgs, nixos-hardware, chaosevents, fernglas, nixos-exporter, solid-xmpp-alarm, ... }@inputs: let
-    helper = (import ./lib/flake-helper.nix) inputs;
+    lib = import ./lib inputs;
+    helper = lib.flake-helper;
   in {
     clerie.hosts = {
       aluminium = {

lib/default.nix

@@ -0,0 +1,20 @@
+inputs:
+
+let
+
+  callLibs = file: import file ({
+    inherit lib inputs;
+  } // inputs);
+
+  lib = {
+    flake-helper = callLibs ./flake-helper.nix;
+    inherit ("flake-helper")
+      generateNixosSystem
+      mapToNixosConfigurations
+      generateColmenaHost
+      mapToColmenaHosts
+      buildHosts;
+  };
+
+in
+  lib