From c41b295d888c2aa89735250210e7f037bfa3daa6 Mon Sep 17 00:00:00 2001
From: Drew Haven <drew.haven@gmail.com>
Date: Wed, 2 Apr 2025 17:42:11 -0700
Subject: [PATCH] [syncthing] More relay config

---
 home-manager/features/notes.nix    | 17 ++++++++++++-----
 system/hosts/mcp/configuration.nix |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/home-manager/features/notes.nix b/home-manager/features/notes.nix
index ab6d60f..346c4f0 100644
--- a/home-manager/features/notes.nix
+++ b/home-manager/features/notes.nix
@@ -13,7 +13,11 @@
         Notes = {
           label = "Notes";
           path = "~/Documents/Notes";
-          devices = [ "altair" "mcp" "vega" ];
+          devices = [
+            "altair"
+            "mcp"
+            "vega"
+          ];
         };
       };
       devices = {
@@ -21,7 +25,8 @@
           id = "6O3U5QK-PR4RAAB-L32TR6K-USM7PER-VJBIKCI-FOWNA2G-7CQU5HF-R2OXNQ2";
           name = "mcp";
           addresses = [
-            "tcp://mcp.blazestar.net"
+            # "tcp://mcp.blazestar.net"
+            "relay://syncthing.blazestar.net:22067"
           ];
           compression = "always";
         };
@@ -29,7 +34,8 @@
           id = "U55HQDN-YTUQAGA-G4O4LMZ-OAVAUVZ-RBDD2S6-JAWAUF2-Z4VZ7BM-TIIVUA4";
           name = "vega";
           addresses = [
-            "tcp://vega.blazestar.net"
+            # "tcp://vega.blazestar.net"
+            "relay://syncthing.blazestar.net:22067"
           ];
           compression = "always";
         };
@@ -37,7 +43,8 @@
           id = "W5QZDM6-CUVQJIG-DR4BJCU-IQ7UGTJ-NQUSW73-E3GWSLU-A2QEMKR-BRDH3Q3";
           name = "altair";
           addresses = [
-            "tcp://altair.blazestar.net"
+            # "tcp://altair.blazestar.net"
+            "relay://syncthing.blazestar.net:22067"
           ];
           compression = "always";
         };
@@ -47,7 +54,7 @@
         globalAnnounceEnabled = false;
         relaysEnabled = true;
         listenAddresses = [
-          "relay://syncthing.blazestar.net:22067"
+          "relay://syncthing.blazestar.net:22067/?id=TITGK5I-55GDSAF-HHPCSMZ-AHD2YKT-LZSKYRQ-5B6MGE4-LMLNEP6-KQ4UJQF&networkTimeout=2m0s&pingInterval=1m0s&statusAddr=%3A22070"
         ];
         # Whether the user has accepted submitting usage data.  0 is no-choice.
         # -1 means no.  A positive integer means yes.
diff --git a/system/hosts/mcp/configuration.nix b/system/hosts/mcp/configuration.nix
index 7cbc873..a4391c6 100644
--- a/system/hosts/mcp/configuration.nix
+++ b/system/hosts/mcp/configuration.nix
@@ -115,6 +115,7 @@
   # So I don't have to use public relays
   services.syncthing.relay = {
     enable = true;
+    # Leave this empty, meaning it won't join any public pools.
     pools = [ ];
   };
 
@@ -122,6 +123,7 @@
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [
     22067 # Syncthing relay
+    22070 # Syncthing relay status
   ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.