From 671f5925c1b12a1742327f3b84bf1875dbe0e4f7 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 10 Dec 2023 18:27:55 +0100
Subject: [PATCH] lib/default.nix: Refactor lib loading

---
 flake.nix       |  3 ++-
 lib/default.nix | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 lib/default.nix

diff --git a/flake.nix b/flake.nix
index e17e005..380ac69 100644
--- a/flake.nix
+++ b/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 = {
diff --git a/lib/default.nix b/lib/default.nix
new file mode 100644
index 0000000..ba58fa5
--- /dev/null
+++ b/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