Refactor homelab ports

hosts/nixedo/modules/nginx/default.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 
 let
-  sites = import ./sites.nix;
+  sites = import ./sites.nix { ports = config.homelab.ports; };
 in
 {
   services = {

hosts/nixedo/modules/nginx/ports.nix

@@ -1,15 +0,0 @@
-{
-  bootstrap-with-tailwind = 8081;
-  eric = 8084;
-  florida-drupalcamp-tailwind-css = 8083;
-  luke = 8094;
-  phpsw-sculpin-demo = 8085;
-  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;
-}

hosts/nixedo/modules/nginx/sites.nix

@@ -1,20 +1,14 @@
+{ ports }:
+
 let
-  domain = "oliverdavies.uk";
-
-  ports = import ./ports.nix;
-
   mkSite =
     name: overrides:
     let
       root = "/var/www/vhosts/${name}" + (overrides.rootSuffix or "");
+      port = ports."nginx-${name}";
+      url = "${name}.oliverdavies.uk";
     in
-    {
-      inherit root;
-
-      port = ports.${name};
-      url = "${name}.${domain}";
-    }
-    // overrides;
+    { inherit port root url; } // overrides;
 
   sites = [
     (mkSite "eric" {

hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix

@@ -1,5 +1,8 @@
+{ config, ... }:
+
 let
-  port = 8095;
+  ports = config.homelab.ports;
+  port = ports.nginx-website-sculpin;
 
   redirects = import ./www.oliverdavies.uk-redirects.nix;
 
@@ -18,7 +21,7 @@ let
       "tome-test"
     ];
 
-    port = 8098;
+    port = ports.nginx-website-tome;
   };
 
   tomeLocations = builtins.listToAttrs (