From fdb1b559bc2f92a29aa79b7f3fad0205df73a410 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Thu, 22 Jan 2026 14:56:36 -0500
Subject: [PATCH] wg: don't hardcode namespaceAddress

---
 flake.nix                                 | 1 -
 services/bitmagnet.nix                    | 2 +-
 services/jellyfin-qbittorrent-monitor.nix | 2 +-
 services/qbittorrent.nix                  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 67da812..29e069c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,7 +119,6 @@
         https = {
           certs = services_dir + "/http_certs";
           domain = "gardling.com";
-          wg_ip = "192.168.15.1";
         };
 
         gitea = {
diff --git a/services/bitmagnet.nix b/services/bitmagnet.nix
index 9d03a74..d537315 100644
--- a/services/bitmagnet.nix
+++ b/services/bitmagnet.nix
@@ -26,6 +26,6 @@
 
   services.caddy.virtualHosts."bitmagnet.${service_configs.https.domain}".extraConfig = ''
     import ${config.age.secrets.caddy_auth.path}
-    reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.bitmagnet}
+    reverse_proxy ${config.vpnNamespaces.wg.namespaceAddress}:${builtins.toString service_configs.ports.bitmagnet}
   '';
 }
diff --git a/services/jellyfin-qbittorrent-monitor.nix b/services/jellyfin-qbittorrent-monitor.nix
index 3ca0818..c1f89cc 100644
--- a/services/jellyfin-qbittorrent-monitor.nix
+++ b/services/jellyfin-qbittorrent-monitor.nix
@@ -44,7 +44,7 @@
 
     environment = {
       JELLYFIN_URL = "http://localhost:${builtins.toString service_configs.ports.jellyfin}";
-      QBITTORRENT_URL = "http://${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.torrent}";
+      QBITTORRENT_URL = "http://${config.vpnNamespaces.wg.namespaceAddress}:${builtins.toString service_configs.ports.torrent}";
       CHECK_INTERVAL = "30";
     };
   };
diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix
index 0ae94a6..bcd1ebb 100644
--- a/services/qbittorrent.nix
+++ b/services/qbittorrent.nix
@@ -104,7 +104,7 @@
 
   services.caddy.virtualHosts."torrent.${service_configs.https.domain}".extraConfig = ''
     import ${config.age.secrets.caddy_auth.path}
-    reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString config.services.qbittorrent.webuiPort}
+    reverse_proxy ${config.vpnNamespaces.wg.namespaceAddress}:${builtins.toString config.services.qbittorrent.webuiPort}
   '';
 
   users.users.${config.services.qbittorrent.user}.extraGroups = [