From 2a331f5af187e7b38edf6f89febd8ee756cd064d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 5 Jan 2025 14:00:48 +0000
Subject: [PATCH] Re-organise hetznix configuration
---
nix/hosts/hetznix/configuration.nix | 7 ++-----
nix/hosts/hetznix/{modules => security}/acme.nix | 0
nix/hosts/hetznix/security/default.nix | 3 +++
.../hetznix/{modules => services}/caddy/default.nix | 0
.../caddy/vhosts/2020.oliverdavies.uk.nix | 0
.../vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix | 0
...florida-drupalcamp-tailwind-css.oliverdavies.uk.nix | 0
.../caddy/vhosts/luke.oliverdavies.uk.nix | 0
.../vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix | 0
.../caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix | 0
.../caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix | 0
.../vhosts/rebuilding-bristol-js.oliverdavies.uk.nix | 0
.../vhosts/rebuilding-symfony.oliverdavies.uk.nix | 0
.../caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix | 0
.../talking-drupal-tailwindcss.oliverdavies.uk.nix | 0
.../caddy/vhosts/wp-tailwind.oliverdavies.uk.nix | 0
.../caddy/vhosts/www.oliverdavies.uk.nix | 0
.../caddy/vhosts/zet.oliverdavies.uk.nix | 0
nix/hosts/hetznix/services/default.nix | 10 ++++++++++
19 files changed, 15 insertions(+), 5 deletions(-)
rename nix/hosts/hetznix/{modules => security}/acme.nix (100%)
create mode 100644 nix/hosts/hetznix/security/default.nix
rename nix/hosts/hetznix/{modules => services}/caddy/default.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/2020.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/luke.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/www.oliverdavies.uk.nix (100%)
rename nix/hosts/hetznix/{modules => services}/caddy/vhosts/zet.oliverdavies.uk.nix (100%)
create mode 100644 nix/hosts/hetznix/services/default.nix
diff --git a/nix/hosts/hetznix/configuration.nix b/nix/hosts/hetznix/configuration.nix
index 7a934f64..739135e3 100644
--- a/nix/hosts/hetznix/configuration.nix
+++ b/nix/hosts/hetznix/configuration.nix
@@ -13,9 +13,8 @@
./disks.nix
./hardware-configuration.nix
./secrets.nix
-
- ./modules/acme.nix
- ./modules/caddy
+ ./security
+ ./services
];
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs-2405}" ];
@@ -30,8 +29,6 @@
efiInstallAsRemovable = true;
};
- services.openssh.enable = true;
-
environment.systemPackages = map lib.lowPrio [
pkgs.curl
pkgs.gitMinimal
diff --git a/nix/hosts/hetznix/modules/acme.nix b/nix/hosts/hetznix/security/acme.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/acme.nix
rename to nix/hosts/hetznix/security/acme.nix
diff --git a/nix/hosts/hetznix/security/default.nix b/nix/hosts/hetznix/security/default.nix
new file mode 100644
index 00000000..e8ee8aa6
--- /dev/null
+++ b/nix/hosts/hetznix/security/default.nix
@@ -0,0 +1,3 @@
+{
+ imports = [ ./acme.nix ];
+}
diff --git a/nix/hosts/hetznix/modules/caddy/default.nix b/nix/hosts/hetznix/services/caddy/default.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/default.nix
rename to nix/hosts/hetznix/services/caddy/default.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/2020.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/2020.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/2020.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/2020.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/bootstrap-with-tailwind.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/luke.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/luke.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/luke.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/luke.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/phpsw-sculpin-demo.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/rebuilding-acquia.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bartik.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/rebuilding-bristol-js.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/rebuilding-symfony.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/tailwindcss-demo.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/talking-drupal-tailwindcss.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/wp-tailwind.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/www.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/www.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/www.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/www.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/zet.oliverdavies.uk.nix b/nix/hosts/hetznix/services/caddy/vhosts/zet.oliverdavies.uk.nix
similarity index 100%
rename from nix/hosts/hetznix/modules/caddy/vhosts/zet.oliverdavies.uk.nix
rename to nix/hosts/hetznix/services/caddy/vhosts/zet.oliverdavies.uk.nix
diff --git a/nix/hosts/hetznix/services/default.nix b/nix/hosts/hetznix/services/default.nix
new file mode 100644
index 00000000..11aa65a0
--- /dev/null
+++ b/nix/hosts/hetznix/services/default.nix
@@ -0,0 +1,10 @@
+{
+ imports = [
+ ./acme.nix
+ ./caddy
+ ];
+
+ services = {
+ openssh.enable = true;
+ };
+}