From fa38f26bb1c2d981d46efd51d53e8828277fc22b Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 5 Nov 2025 00:27:05 +0000
Subject: [PATCH] Refactor homelab ports

Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>
---
 hosts/nixedo/modules/containers/pi-hole.nix   |  2 +-
 .../modules/containers/tubearchivist.nix      |  2 +-
 .../modules/nginx/oliverdavies.uk/default.nix |  4 +-
 .../modules/nginx/ponthirtaekwondo.co.uk.nix  |  2 +-
 hosts/nixedo/modules/nginx/sites.nix          |  2 +-
 hosts/nixedo/ports.nix                        | 50 ++++++++++---------
 hosts/nixedo/services/mealie.nix              |  2 +-
 hosts/nixedo/services/vaultwarden.nix         |  2 +-
 8 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/hosts/nixedo/modules/containers/pi-hole.nix b/hosts/nixedo/modules/containers/pi-hole.nix
index 7d523e89..f7ef64f4 100644
--- a/hosts/nixedo/modules/containers/pi-hole.nix
+++ b/hosts/nixedo/modules/containers/pi-hole.nix
@@ -2,7 +2,7 @@
 
 let
   service = "pihole";
-  port = config.homelab.ports.${service};
+  port = config.homelab.ports.services.${service};
 in
 {
   virtualisation.oci-containers.containers.${service} = {
diff --git a/hosts/nixedo/modules/containers/tubearchivist.nix b/hosts/nixedo/modules/containers/tubearchivist.nix
index 1e308682..57ba7107 100644
--- a/hosts/nixedo/modules/containers/tubearchivist.nix
+++ b/hosts/nixedo/modules/containers/tubearchivist.nix
@@ -13,7 +13,7 @@ let
   service = "tubearchivist";
   homelab = config.homelab;
 
-  port = homelab.ports.${service};
+  port = homelab.ports.services.${service};
 in
 {
   options.homelab.services.${service} = {
diff --git a/hosts/nixedo/modules/nginx/oliverdavies.uk/default.nix b/hosts/nixedo/modules/nginx/oliverdavies.uk/default.nix
index cfae1427..467b60ac 100644
--- a/hosts/nixedo/modules/nginx/oliverdavies.uk/default.nix
+++ b/hosts/nixedo/modules/nginx/oliverdavies.uk/default.nix
@@ -2,7 +2,7 @@
 
 let
   ports = config.homelab.ports;
-  port = ports.nginx-website-sculpin;
+  port = ports.nginx.website-sculpin;
 
   redirects = builtins.concatStringsSep "\n" (
     map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") (import ./redirects.nix)
@@ -26,7 +26,7 @@ let
       "themes/custom/opdavies"
     ];
 
-    port = ports.nginx-website-tome;
+    port = ports.nginx.website-tome;
   };
 
   tomeLocations = builtins.listToAttrs (
diff --git a/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix b/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix
index 23e44c33..f16e61b2 100644
--- a/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix
+++ b/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix
@@ -3,7 +3,7 @@
 let
   name = "ponthirtaekwondo.co.uk";
   ports = config.homelab.ports;
-  port = ports.nginx-ponthir-taekwondo;
+  port = ports.nginx.ponthir-taekwondo;
 in
 {
   security.acme.certs = {
diff --git a/hosts/nixedo/modules/nginx/sites.nix b/hosts/nixedo/modules/nginx/sites.nix
index 3d682ec7..78325fb2 100644
--- a/hosts/nixedo/modules/nginx/sites.nix
+++ b/hosts/nixedo/modules/nginx/sites.nix
@@ -5,7 +5,7 @@ let
     name: overrides:
     let
       root = "/var/www/vhosts/${name}" + (overrides.rootSuffix or "");
-      port = ports."nginx-${name}";
+      port = ports.nginx.${name};
       url = "${name}.oliverdavies.uk";
     in
     { inherit port root url; } // overrides;
diff --git a/hosts/nixedo/ports.nix b/hosts/nixedo/ports.nix
index 50379727..7d5e3c50 100644
--- a/hosts/nixedo/ports.nix
+++ b/hosts/nixedo/ports.nix
@@ -6,33 +6,37 @@ in
 {
   options.homelab.ports = mkOption {
     internal = true;
-    type = types.attrsOf types.port;
+    type = types.attrsOf (types.attrsOf types.port);
   };
 
   config.homelab.ports = {
-    mealie = 9001;
-    pihole = 8082;
-    tubearchivist = 8099;
-    vaultwarden = 8022;
+    services = {
+      mealie = 9001;
+      pihole = 8082;
+      tubearchivist = 8099;
+      vaultwarden = 8022;
+    };
 
-    nginx-website-sculpin = 8095;
-    nginx-website-tome = 8098;
+    nginx = {
+      website-sculpin = 8095;
+      website-tome = 8098;
 
-    nginx-books = 9002;
-    nginx-bootstrap-with-tailwind = 8081;
-    nginx-eric = 8084;
-    nginx-examples = 9003;
-    nginx-florida-drupalcamp-tailwind-css = 8083;
-    nginx-luke = 8094;
-    nginx-phpsw-sculpin-demo = 8085;
-    nginx-ponthir-taekwondo = 9004;
-    nginx-rebuilding-acquia = 8086;
-    nginx-rebuilding-bartik = 8087;
-    nginx-rebuilding-bristol-js = 8088;
-    nginx-rebuilding-symfony = 8089;
-    nginx-tailwindcss-demo = 8090;
-    nginx-talking-drupal-tailwindcss = 8093;
-    nginx-wp-tailwind = 8091;
-    nginx-zet = 8092;
+      books = 9002;
+      bootstrap-with-tailwind = 8081;
+      eric = 8084;
+      examples = 9003;
+      florida-drupalcamp-tailwind-css = 8083;
+      luke = 8094;
+      phpsw-sculpin-demo = 8085;
+      ponthir-taekwondo = 9004;
+      rebuilding-acquia = 8086;
+      rebuilding-bartik = 8087;
+      rebuilding-bristol-js = 8088;
+      rebuilding-symfony = 8089;
+      tailwindcss-demo = 8090;
+      talking-drupal-tailwindcss = 8093;
+      wp-tailwind = 8091;
+      zet = 8092;
+    };
   };
 }
diff --git a/hosts/nixedo/services/mealie.nix b/hosts/nixedo/services/mealie.nix
index ceb4516f..b6c36042 100644
--- a/hosts/nixedo/services/mealie.nix
+++ b/hosts/nixedo/services/mealie.nix
@@ -10,7 +10,7 @@ in
 
     database.createLocally = true;
 
-    port = ports.mealie;
+    port = ports.services.mealie;
 
     settings.ALLOW_SIGNUP = "false";
   };
diff --git a/hosts/nixedo/services/vaultwarden.nix b/hosts/nixedo/services/vaultwarden.nix
index b3f697a3..48a64f8e 100644
--- a/hosts/nixedo/services/vaultwarden.nix
+++ b/hosts/nixedo/services/vaultwarden.nix
@@ -32,7 +32,7 @@ in
         config = {
           DOMAIN = "https://${cfg.url}";
           ROCKET_ADDRESS = "127.0.0.1";
-          ROCKET_PORT = homelab.ports.${service};
+          ROCKET_PORT = homelab.ports.services.${service};
           SIGNUPS_ALLOWED = false;
         };
       };