build0*: move into /hosts

.sops.yaml

@@ -25,7 +25,7 @@ creation_rules:
           - *ryantm
           - *zimbatm
           - *zowoq
-  - path_regex: build01/[^/]+\.yaml$
+  - path_regex: hosts/build01/[^/]+\.yaml$
     key_groups:
       - age:
           - *build01
@@ -33,7 +33,7 @@ creation_rules:
           - *ryantm
           - *zimbatm
           - *zowoq
-  - path_regex: build02/[^/]+\.yaml$
+  - path_regex: hosts/build02/[^/]+\.yaml$
     key_groups:
       - age:
           - *build02
@@ -41,7 +41,7 @@ creation_rules:
           - *ryantm
           - *zimbatm
           - *zowoq
-  - path_regex: build03/[^/]+\.yaml$
+  - path_regex: hosts/build03/[^/]+\.yaml$
     key_groups:
       - age:
           - *build03
@@ -49,7 +49,7 @@ creation_rules:
           - *ryantm
           - *zimbatm
           - *zowoq
-  - path_regex: build04/[^/]+\.yaml$
+  - path_regex: hosts/build04/[^/]+\.yaml$
     key_groups:
       - age:
           - *build04

dev/treefmt.nix

@@ -26,7 +26,7 @@
       excludes = [
         "nix/sources.nix"
         # vendored from external source
-        "build02/packages-with-update-script.nix"
+        "hosts/build02/packages-with-update-script.nix"
       ];
     };
 

flake.nix

@@ -98,19 +98,19 @@
           {
             build01 = nixosSystem {
               system = "x86_64-linux";
-              modules = [ ./build01/configuration.nix ];
+              modules = [ ./hosts/build01/configuration.nix ];
             };
             build02 = nixosSystem {
               system = "x86_64-linux";
-              modules = [ ./build02/configuration.nix ];
+              modules = [ ./hosts/build02/configuration.nix ];
             };
             build03 = nixosSystem {
               system = "x86_64-linux";
-              modules = [ ./build03/configuration.nix ];
+              modules = [ ./hosts/build03/configuration.nix ];
             };
             build04 = nixosSystem {
               system = "aarch64-linux";
-              modules = [ ./build04/configuration.nix ];
+              modules = [ ./hosts/build04/configuration.nix ];
             };
           };
 

modules/nixos/sops-nix.nix

@@ -1,6 +1,6 @@
 { config, inputs, lib, ... }:
 let
-  defaultSopsPath = "${toString inputs.self}/${config.networking.hostName}/secrets.yaml";
+  defaultSopsPath = "${toString inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
 in
 {
   sops.defaultSopsFile = lib.mkIf (builtins.pathExists defaultSopsPath) defaultSopsPath;

tasks.py

@@ -158,7 +158,7 @@ def decrypt_host_key(flake_attr, tmpdir):
                 "--extract",
                 '["ssh_host_ed25519_key"]',
                 "--decrypt",
-                f"{ROOT}/{flake_attr}/secrets.yaml",
+                f"{ROOT}/hosts/{flake_attr}/secrets.yaml",
             ],
             check=True,
             stdout=fh,