Merge pull request #333 from nix-community/refactor

refactor roles

README.md

@@ -139,7 +139,7 @@ $ inv setup-secret --hosts buildXX
 
 ```console
 $ nixos-generate-config  --root /tmp
-# optional, in most cases one can import roles/hardware/hetzner-amd.nix
+# optional, in most cases one can import roles/hetzner/amd.nix
 $ scp buildXX.nix-community.org:/tmp/etc/nixos/hardware-configuration.nix buildXX/hardware-configuration.nix
 ```
 

build01/configuration.nix

@@ -11,10 +11,9 @@
 # nixos-enter
 {
   imports = [
-    ../roles/dev-packages.nix
     ../roles/common.nix
-    ../roles/hardware/hetzner-amd.nix
-    ../roles/hetzner-network.nix
+    ../roles/hetzner/amd.nix
+    ../roles/hetzner/network.nix
     ../roles/raid.nix
     ../roles/builder
     ../roles/remote-builder/aarch64-nixos-community.nix

build02/configuration.nix

@@ -3,8 +3,8 @@
 {
   imports = [
     ../roles/common.nix
-    ../roles/hardware/hetzner-amd.nix
-    ../roles/hetzner-network.nix
+    ../roles/hetzner/amd.nix
+    ../roles/hetzner/network.nix
     ../roles/nginx.nix
     ../roles/raid.nix
     ../roles/remote-builder/aarch64-build04.nix

build03/configuration.nix

@@ -11,16 +11,16 @@
   # $ nixos-enter
   imports = [
     ../roles/common.nix
-    ../roles/hardware/hetzner-amd.nix
+    ../roles/hetzner/amd.nix
+    ../roles/hetzner/network.nix
     ../roles/hercules-ci
-    ../roles/hetzner-network.nix
     ../roles/nginx.nix
     ../roles/raid.nix
     ../roles/remote-builder/aarch64-build04.nix
 
     ../services/hound
     ../services/hydra
-    ../services/matterbridge.nix
+    ../services/matterbridge
   ];
 
   # /boot is a mirror raid

build04/configuration.nix

@@ -4,7 +4,7 @@
     ./hardware-configuration.nix
     ../roles/common.nix
     ../roles/hercules-ci
-    ../roles/builder.nix
+    ../roles/remote-builder/user.nix
   ];
 
   nixpkgs.system = "aarch64-linux";

roles/builder/default.nix

@@ -1,3 +1,6 @@
 { ... }: {
-  imports = [ ./users.nix ];
+  imports = [
+    ./packages.nix
+    ./users.nix
+  ];
 }

roles/common.nix

@@ -3,14 +3,14 @@
 {
 
   imports = [
+    ./auto-upgrade.nix
     ./nix-daemon.nix
     ./security.nix
+    ./sops-nix.nix
     ./sshd.nix
-    ./telegraf
+    ./telegraf.nix
     ./users.nix
     ./zfs.nix
-    ./sops-nix.nix
-    ./auto-upgrade.nix
   ];
 
   environment.systemPackages = [