From af444584d09eda850d4327af2d74874be3028a75 Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Sat, 8 Nov 2025 21:35:13 -0300
Subject: [PATCH] Add shared services infrastructure for cross-host data

Created centralized service definitions in shared/services.nix to store
service metadata (domains, IPs, ports) that need to be accessible across
multiple hosts. This replaces the per-service split DNS module approach
with a single source of truth.

Services are now exported through utils.nix for easy access in host configs.
---
 hosts/alexandria/librespeed.nix | 39 ----------------------------
 shared/services.nix             | 39 ++++++++++++++++++++++++++++
 utils.nix                       | 46 +++++++++++++++++----------------
 3 files changed, 63 insertions(+), 61 deletions(-)
 delete mode 100644 hosts/alexandria/librespeed.nix
 create mode 100644 shared/services.nix

diff --git a/hosts/alexandria/librespeed.nix b/hosts/alexandria/librespeed.nix
deleted file mode 100644
index 9b59685..0000000
--- a/hosts/alexandria/librespeed.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  ...
-}:
-
-let
-  utils = import ../../utils.nix { inherit inputs lib; };
-  inherit (utils) mkNginxVHosts;
-in
-
-{
-  virtualisation.oci-containers.containers."librespeed" = {
-    image = "lscr.io/linuxserver/librespeed:latest";
-    environment = {
-      TZ = "America/Bahia";
-    };
-    ports = [ "127.0.0.1:58080:80" ];
-    extraOptions = [
-      "--pull=newer"
-      "--label=io.containers.autoupdate=registry"
-    ];
-  };
-
-  services.nginx.virtualHosts = mkNginxVHosts {
-    acmeHost = "baduhai.dev";
-    domains."speedtest.baduhai.dev".locations."/".proxyPass = "http://127.0.0.1:58080/";
-  };
-
-  # Register this domain for split DNS
-  services.splitDNS.entries = [
-    {
-      domain = "speedtest.baduhai.dev";
-      lanIP = "192.168.15.142";
-      tailscaleIP = "100.76.19.50";
-    }
-  ];
-}
diff --git a/shared/services.nix b/shared/services.nix
new file mode 100644
index 0000000..f55e4d2
--- /dev/null
+++ b/shared/services.nix
@@ -0,0 +1,39 @@
+# Shared service definitions for cross-host configuration
+# Used by:
+# - alexandria: DNS server (LAN) + service hosting (vaultwarden, nextcloud, jellyfin)
+# - trantor: DNS server (Tailnet) + service hosting (forgejo)
+{
+  services = [
+    {
+      name = "vaultwarden";
+      domain = "vault.baduhai.dev";
+      host = "alexandria";
+      lanIP = "192.168.15.142";
+      tailscaleIP = "100.76.19.50";
+      port = 8222;
+    }
+    {
+      name = "forgejo";
+      domain = "git.baduhai.dev";
+      host = "trantor";
+      tailscaleIP = "100.108.5.90";
+      port = 3000;
+    }
+    {
+      name = "nextcloud";
+      domain = "cloud.baduhai.dev";
+      host = "alexandria";
+      lanIP = "192.168.15.142";
+      tailscaleIP = "100.76.19.50";
+      port = 443;
+    }
+    {
+      name = "jellyfin";
+      domain = "jellyfin.baduhai.dev";
+      host = "alexandria";
+      lanIP = "192.168.15.142";
+      tailscaleIP = "100.76.19.50";
+      port = 8096;
+    }
+  ];
+}
diff --git a/utils.nix b/utils.nix
index c803fe5..740bad0 100644
--- a/utils.nix
+++ b/utils.nix
@@ -8,9 +8,14 @@ let
     home-manager
     agenix
     ;
+
+  # Import shared service definitions
+  sharedServices = import ./shared/services.nix;
 in
 
 {
+  # Re-export shared services for use in host configs
+  inherit (sharedServices) services;
   # Tag-based host configuration system
   mkHost =
     {
@@ -196,27 +201,24 @@ in
   mkSplitDNS =
     entries:
     let
-      # Generate view entries for a single domain
-      mkEntry =
-        {
-          domain,
-          lanIP,
-          tailscaleIP,
-        }:
-        [
-          {
-            name = "tailscale";
-            view-first = true;
-            local-zone = ''"baduhai.dev." transparent'';
-            local-data = ''"${domain}. IN A ${tailscaleIP}"'';
-          }
-          {
-            name = "lan";
-            view-first = true;
-            local-zone = ''"baduhai.dev." transparent'';
-            local-data = ''"${domain}. IN A ${lanIP}"'';
-          }
-        ];
+      # Generate local-data entries for all domains
+      tailscaleData = map (e: ''"${e.domain}. IN A ${e.tailscaleIP}"'') entries;
+      lanData = map (e: ''"${e.domain}. IN A ${e.lanIP}"'') entries;
     in
-    builtins.concatMap mkEntry entries;
+    [
+      # Single Tailscale view with all domains
+      {
+        name = "tailscale";
+        view-first = true;
+        local-zone = ''"baduhai.dev." transparent'';
+        local-data = tailscaleData;
+      }
+      # Single LAN view with all domains
+      {
+        name = "lan";
+        view-first = true;
+        local-zone = ''"baduhai.dev." transparent'';
+        local-data = lanData;
+      }
+    ];
 }