flake: split up per host

Inject the inputs in specialArgs so they can be used in the modules
directly. This allows us to split up the top-level flake as well.

build01/configuration.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 # Boot recovery:
 # Activate 64-bit Rescue system in https://robot.your-server.de/server
 # ssh root@build01.nix-community.org "mount /dev/md[0-9]* /mnt && /mnt/kexec_bundle"
@@ -11,6 +11,7 @@
 # nixos-enter
 {
   imports = [
+    inputs.srvos.nixosModules.hardware-hetzner-online-amd
     ../roles/common.nix
     ../roles/raid.nix
     ../roles/zfs.nix

build01/default.nix

@@ -0,0 +1,7 @@
+{ self, ... }:
+{
+  flake.nixosConfigurations.build01 = self.lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [ ./configuration.nix ];
+  };
+}

build02/configuration.nix

@@ -1,7 +1,9 @@
-{ ... }:
+{ inputs, ... }:
 
 {
   imports = [
+    inputs.srvos.nixosModules.mixins-nginx
+    inputs.srvos.nixosModules.hardware-hetzner-online-amd
     ./nixpkgs-update.nix
     ./nixpkgs-update-backup.nix
     ../roles/common.nix

build02/default.nix

@@ -0,0 +1,8 @@
+{ self, ... }:
+{
+  flake.nixosConfigurations.build02 = self.lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [ ./configuration.nix ];
+  };
+}
+

build03/configuration.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 {
   # Boot recovery:
   # Activate 64-bit Rescue system in https://robot.your-server.de/server
@@ -10,6 +10,8 @@
   # $ zpool import -f zroot && mount -t zfs zroot/root/nixos /mnt && mount -t zfs zroot/root/home /mnt/home && mount /dev/md[0-9]* /mnt/boot
   # $ nixos-enter
   imports = [
+    inputs.srvos.nixosModules.mixins-nginx
+    inputs.srvos.nixosModules.hardware-hetzner-online-amd
     ../roles/common.nix
     ../roles/hercules-ci
     ../roles/watch-store.nix

build03/default.nix

@@ -0,0 +1,7 @@
+{ self, ... }:
+{
+  flake.nixosConfiguration.build03 = self.lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [ ./configuration.nix ];
+  };
+}

build04/configuration.nix

@@ -1,5 +1,7 @@
+{ inputs, ... }:
 {
   imports = [
+    inputs.disko.nixosModules.disko
     ./hardware-configuration.nix
     ../roles/common.nix
     ../roles/hercules-ci

build04/default.nix

@@ -0,0 +1,7 @@
+{ self, ... }:
+{
+  flake.nixosConfigurations.build04 = self.lib.nixosSystem {
+    system = "aarch64-linux";
+    modules = [ ./configuration.nix ];
+  };
+}

flake.nix

@@ -42,10 +42,13 @@
   };
 
   outputs = inputs @ { flake-parts, self, ... }:
-    flake-parts.lib.mkFlake
+    flake-parts.lib.mkFlake { inherit inputs; } {
-      { inherit inputs; }
+      systems = [
-      {
+        "aarch64-darwin"
-        systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+        "aarch64-linux"
+        "x86_64-darwin"
+        "x86_64-linux"
+      ];
 
       herculesCI = { lib, ... }: {
         ciSystems = [ "x86_64-linux" "aarch64-linux" ];
@@ -65,15 +68,19 @@
         };
       };
 
+      hercules-ci.github-pages.branch = "master";
+
       imports = [
         inputs.hercules-ci-effects.flakeModule
         inputs.treefmt-nix.flakeModule
         ./effect.nix
         ./shell.nix
+        ./build01
+        ./build02
+        ./build03
+        ./build04
       ];
 
-        hercules-ci.github-pages.branch = "master";
-
       perSystem = { config, pkgs, ... }: {
         treefmt.imports = [ ./treefmt.nix ];
 
@@ -88,61 +95,11 @@
         hercules-ci.github-pages.settings.contents = config.packages.pages;
       };
 
-        flake.nixosConfigurations =
+      flake.lib.nixosSystem = args:
-          let
+        inputs.nixpkgs.lib.nixosSystem ({ specialArgs = { inherit inputs; }; } // args);
-            inherit (inputs.nixpkgs.lib) nixosSystem;
-            common = [
-              { _module.args.inputs = inputs; }
-              { srvos.flake = inputs.self; }
-              inputs.sops-nix.nixosModules.sops
-              inputs.srvos.nixosModules.server
 
-              inputs.srvos.nixosModules.mixins-telegraf
+      flake.nixosModules = {
-              { networking.firewall.allowedTCPPorts = [ 9273 ]; }
+        common = ./roles/common.nix;
-            ];
-          in
-          {
-            build01 = nixosSystem {
-              system = "x86_64-linux";
-              modules =
-                common
-                ++ [
-                  ./build01/configuration.nix
-                  inputs.srvos.nixosModules.hardware-hetzner-online-amd
-                ];
-            };
-
-            build02 = nixosSystem {
-              system = "x86_64-linux";
-              modules =
-                common
-                ++ [
-                  ./build02/configuration.nix
-                  inputs.srvos.nixosModules.mixins-nginx
-                  inputs.srvos.nixosModules.hardware-hetzner-online-amd
-                ];
-            };
-
-            build03 = nixosSystem {
-              system = "x86_64-linux";
-              modules =
-                common
-                ++ [
-                  ./build03/configuration.nix
-                  inputs.srvos.nixosModules.mixins-nginx
-                  inputs.srvos.nixosModules.hardware-hetzner-online-amd
-                ];
-            };
-
-            build04 = nixosSystem {
-              system = "aarch64-linux";
-              modules =
-                common
-                ++ [
-                  ./build04/configuration.nix
-                  inputs.disko.nixosModules.disko
-                ];
-            };
       };
     };
 }

roles/common.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [
     ./auto-upgrade.nix
@@ -6,8 +6,15 @@
     ./security.nix
     ./sops-nix.nix
     ./users.nix
+    inputs.sops-nix.nixosModules.sops
+    inputs.srvos.nixosModules.mixins-telegraf
+    inputs.srvos.nixosModules.server
   ];
 
+  networking.firewall.allowedTCPPorts = [ 9273 ];
+
+  srvos.flake = inputs.self;
+
   zramSwap.enable = true;
 
   # https://github.com/hercules-ci/hercules-ci-agent/issues/514