flake.nix

@@ -90,7 +90,7 @@
       _iso = { name = "_iso"; };
     };
 
-    nixosConfigurations = import ./flake/nixosConfigurations.nix inputs;
+    nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts;
 
     nixosModules = {
       nixfilesInputs = import ./flake/modules.nix inputs;

lib/default.nix

@@ -7,6 +7,10 @@ let
   } // inputs);
 
   lib = {
+    flake-helper = callLibs ./flake-helper.nix;
+    inherit ("flake-helper")
+      generateNixosSystem
+      mapToNixosConfigurations;
     clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix;
   };
 

lib/flake-helper.nix

@@ -1,9 +1,6 @@
-{ self
+{ self, nixpkgs, fernglas, fieldpoc, nixos-exporter, solid-xmpp-alarm, sops-nix, ... }@inputs:
-, nixpkgs
-, ...
-}@inputs:
 
-let
+rec {
   generateNixosSystem = {
     name,
     system ? "x86_64-linux",
@@ -16,14 +13,7 @@ let
     modules = modules ++ [
       self.nixosModules.nixfilesInputs
       self.nixosModules.clerie
-
+      ({ ... }: {
-      ({ config, lib, ... }: {
-        # Apply overlays
-        nixpkgs.overlays = [
-          self.overlays.nixfilesInputs
-          self.overlays.clerie
-        ];
-
         /*
           Make the contents of the flake availiable to modules.
           Useful for having the monitoring server scraping the
@@ -33,11 +23,19 @@ let
           inputs = inputs;
           _nixfiles = self;
         };
-
+      })
-        # Expose host group to monitoring
+      ../configuration/common
+      ../users/clerie
+      ({ ... }: {
+        nixpkgs.overlays = [
+          self.overlays.nixfilesInputs
+          self.overlays.clerie
+        ];
         clerie.monitoring = nixpkgs.lib.attrsets.optionalAttrs (group != null) { serviceLevel = group; };
-
+      })
-        # Automatically load secrets from sops file for host
+      (../hosts + "/${name}/configuration.nix")
+      # Automatically load secrets from sops file for host
+      ({ config, lib, ... }: {
         sops.defaultSopsFile = ../hosts + "/${name}/secrets.json";
         sops.secrets = let
           secretFile = config.sops.defaultSopsFile;
@@ -49,17 +47,8 @@ let
         in
           secrets;
       })
-
-      # Config to be applied to every host
-      ../configuration/common
-      ../users/clerie
-
-      # Host specific config
-      (../hosts + "/${name}/configuration.nix")
     ];
   };
 
   mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts;
-
+}
-in
-  mapToNixosConfigurations self.clerie.hosts