From 90ac4307361f1a708f6c390162c4502951e7eeb0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 10:08:07 +1000
Subject: [PATCH 1/6] roles/dev-packages.nix -> roles/builder/packages.nix
---
build01/configuration.nix | 1 -
roles/builder/default.nix | 5 ++++-
roles/{dev-packages.nix => builder/packages.nix} | 0
3 files changed, 4 insertions(+), 2 deletions(-)
rename roles/{dev-packages.nix => builder/packages.nix} (100%)
diff --git a/build01/configuration.nix b/build01/configuration.nix
index 26f4004..b243e11 100644
--- a/build01/configuration.nix
+++ b/build01/configuration.nix
@@ -11,7 +11,6 @@
# nixos-enter
{
imports = [
- ../roles/dev-packages.nix
../roles/common.nix
../roles/hardware/hetzner-amd.nix
../roles/hetzner-network.nix
diff --git a/roles/builder/default.nix b/roles/builder/default.nix
index 370a4b8..187992f 100644
--- a/roles/builder/default.nix
+++ b/roles/builder/default.nix
@@ -1,3 +1,6 @@
{ ... }: {
- imports = [ ./users.nix ];
+ imports = [
+ ./packages.nix
+ ./users.nix
+ ];
}
diff --git a/roles/dev-packages.nix b/roles/builder/packages.nix
similarity index 100%
rename from roles/dev-packages.nix
rename to roles/builder/packages.nix
From f55281340895da2ada24f68f8a0d2a6b28d9eae0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 10:11:40 +1000
Subject: [PATCH 2/6] roles/hardware/hetzner-amd.nix, roles/hetzner-network.nix
-> roles/hetzner
---
README.md | 2 +-
build01/configuration.nix | 4 ++--
build02/configuration.nix | 4 ++--
build03/configuration.nix | 4 ++--
roles/{hardware/hetzner-amd.nix => hetzner/amd.nix} | 0
roles/{hetzner-network.nix => hetzner/network.nix} | 0
6 files changed, 7 insertions(+), 7 deletions(-)
rename roles/{hardware/hetzner-amd.nix => hetzner/amd.nix} (100%)
rename roles/{hetzner-network.nix => hetzner/network.nix} (100%)
diff --git a/README.md b/README.md
index 5dc9653..a324aa2 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,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
```
diff --git a/build01/configuration.nix b/build01/configuration.nix
index b243e11..9cfcddf 100644
--- a/build01/configuration.nix
+++ b/build01/configuration.nix
@@ -12,8 +12,8 @@
{
imports = [
../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
diff --git a/build02/configuration.nix b/build02/configuration.nix
index 862b684..aa9f99e 100644
--- a/build02/configuration.nix
+++ b/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
diff --git a/build03/configuration.nix b/build03/configuration.nix
index 91f8cd3..0bf5b4b 100644
--- a/build03/configuration.nix
+++ b/build03/configuration.nix
@@ -11,9 +11,9 @@
# $ 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
diff --git a/roles/hardware/hetzner-amd.nix b/roles/hetzner/amd.nix
similarity index 100%
rename from roles/hardware/hetzner-amd.nix
rename to roles/hetzner/amd.nix
diff --git a/roles/hetzner-network.nix b/roles/hetzner/network.nix
similarity index 100%
rename from roles/hetzner-network.nix
rename to roles/hetzner/network.nix
From 6e79feff5aedaafdc225202812ce59a1b530d78c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 11:30:46 +1000
Subject: [PATCH 3/6] roles/builder.nix -> roles/remote-builder/user.nix
---
build04/configuration.nix | 2 +-
roles/{builder.nix => remote-builder/user.nix} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename roles/{builder.nix => remote-builder/user.nix} (100%)
diff --git a/build04/configuration.nix b/build04/configuration.nix
index c63039d..7eea8be 100644
--- a/build04/configuration.nix
+++ b/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";
diff --git a/roles/builder.nix b/roles/remote-builder/user.nix
similarity index 100%
rename from roles/builder.nix
rename to roles/remote-builder/user.nix
From 69714f5be8c205033dc103482b00715e1feb330e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 11:34:23 +1000
Subject: [PATCH 4/6] services/matterbridge.nix -> services/matterbridge
---
build03/configuration.nix | 2 +-
services/{matterbridge.nix => matterbridge/default.nix} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename services/{matterbridge.nix => matterbridge/default.nix} (100%)
diff --git a/build03/configuration.nix b/build03/configuration.nix
index 0bf5b4b..b985611 100644
--- a/build03/configuration.nix
+++ b/build03/configuration.nix
@@ -20,7 +20,7 @@
../services/hound
../services/hydra
- ../services/matterbridge.nix
+ ../services/matterbridge
];
# /boot is a mirror raid
diff --git a/services/matterbridge.nix b/services/matterbridge/default.nix
similarity index 100%
rename from services/matterbridge.nix
rename to services/matterbridge/default.nix
From 757a93b80dbc0690ba639063f875638c5740e81a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 12:45:45 +1000
Subject: [PATCH 5/6] roles/telegraf/default.nix -> roles/telegraf.nix
---
roles/common.nix | 2 +-
roles/{telegraf/default.nix => telegraf.nix} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename roles/{telegraf/default.nix => telegraf.nix} (100%)
diff --git a/roles/common.nix b/roles/common.nix
index 307d93a..e752596 100644
--- a/roles/common.nix
+++ b/roles/common.nix
@@ -6,7 +6,7 @@
./nix-daemon.nix
./security.nix
./sshd.nix
- ./telegraf
+ ./telegraf.nix
./users.nix
./zfs.nix
./sops-nix.nix
diff --git a/roles/telegraf/default.nix b/roles/telegraf.nix
similarity index 100%
rename from roles/telegraf/default.nix
rename to roles/telegraf.nix
From a0db17f60ae47b89e998a7d1a5c6ce5d2777ebc3 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 12:45:45 +1000
Subject: [PATCH 6/6] roles/common: sort imports
---
roles/common.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/common.nix b/roles/common.nix
index e752596..b59022a 100644
--- a/roles/common.nix
+++ b/roles/common.nix
@@ -3,14 +3,14 @@
{
imports = [
+ ./auto-upgrade.nix
./nix-daemon.nix
./security.nix
+ ./sops-nix.nix
./sshd.nix
./telegraf.nix
./users.nix
./zfs.nix
- ./sops-nix.nix
- ./auto-upgrade.nix
];
environment.systemPackages = [