flake: refactor

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

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

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

build04/configuration.nix

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

flake.nix

@@ -91,59 +91,28 @@
 
         flake.nixosConfigurations =
           let
-            inherit (inputs.nixpkgs.lib) nixosSystem;
+            inherit (self.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
-              { networking.firewall.allowedTCPPorts = [ 9273 ]; }
-            ];
           in
           {
             build01 = nixosSystem {
               system = "x86_64-linux";
-              modules =
+              modules = [ ./build01/configuration.nix ];
-                common
-                ++ [
-                  ./build01/configuration.nix
-                  inputs.srvos.nixosModules.hardware-hetzner-online-amd
-                ];
             };
-
             build02 = nixosSystem {
               system = "x86_64-linux";
-              modules =
+              modules = [ ./build02/configuration.nix ];
-                common
-                ++ [
-                  ./build02/configuration.nix
-                  inputs.srvos.nixosModules.mixins-nginx
-                  inputs.srvos.nixosModules.hardware-hetzner-online-amd
-                ];
             };
-
             build03 = nixosSystem {
               system = "x86_64-linux";
-              modules =
+              modules = [ ./build03/configuration.nix ];
-                common
-                ++ [
-                  ./build03/configuration.nix
-                  inputs.srvos.nixosModules.mixins-nginx
-                  inputs.srvos.nixosModules.hardware-hetzner-online-amd
-                ];
             };
-
             build04 = nixosSystem {
               system = "aarch64-linux";
-              modules =
+              modules = [ ./build04/configuration.nix ];
-                common
-                ++ [
-                  ./build04/configuration.nix
-                  inputs.disko.nixosModules.disko
-                ];
             };
           };
+
+        flake.lib.nixosSystem = args:
+          inputs.nixpkgs.lib.nixosSystem ({ specialArgs = { inherit inputs; }; } // args);
       };
 }

roles/common.nix

@@ -1,3 +1,4 @@
+{ inputs, ... }:
 {
   imports = [
     ./auto-upgrade.nix
@@ -5,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;
 
   security.acme.defaults.email = "trash@nix-community.org";