From 0e97d8c0c34bc634c59e43853b73cfd5c486291c Mon Sep 17 00:00:00 2001
From: Danilo Reyes <danilo.reyes.251@proton.me>
Date: Sat, 24 Jan 2026 18:53:49 -0600
Subject: [PATCH] syncthing test friend

---
 modules/modules.nix            |  1 +
 modules/services/syncthing.nix | 60 +++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/modules/modules.nix b/modules/modules.nix
index 8f084ae..69a8405 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -57,6 +57,7 @@ in
         wg-friend1 = "10.8.0.2";
         wg-friend2 = "10.8.0.3";
         wg-friend3 = "10.8.0.4";
+        wg-friend4 = "10.8.0.5";
         wg-friends = "10.8.0.0";
       };
       description = "Set of IP's for all my computers.";
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 79ef868..793471f 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -53,34 +53,27 @@ in
           user = "jawz";
           password = config.sops.secrets.syncthing_password.path;
         };
-        devices = {
-          server.id = "BG6PF7S-KATABWO-7WAZFMX-6YO7IS3-WQTMR3M-VSOSV7V-HFFMNNH-BFX2EQ4";
-          miniserver.id = "HDYEGIR-GFU7ONK-MOOJUFH-N3L3XHX-SXWN3FI-O23K6LD-BJENQK5-VIPV2AT";
-          workstation.id = "4E4KJ6M-MSTNBVF-D7CNHDW-DUTB3VR-SXKZ4NH-ZKAOMF5-V24JECJ-4STSZAA";
-          galaxy.id = "UAZ5YDV-YUFBXOY-QMS6S6R-WPIIKZI-4OPPW5L-G4OVUPO-YW5KFYY-YASRAAV";
-          phone.id = "OSOX2VZ-AO2SA3C-BFB6NKF-K6CR6WX-64TDBKW-RRKEKJ4-FKZE5CV-J2RGJAJ";
-          wg-friend1 = {
-            id = "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
-            addresses = [ "tcp://${config.my.ips.wg-friend1}:22000" ];
-            introducer = false;
-            autoAcceptFolders = false;
-            paused = false;
+        devices =
+          let
+            mkWgDevice = name: id: {
+              inherit id;
+              addresses = [ "tcp://${config.my.ips.${name}}:22000" ];
+              introducer = false;
+              autoAcceptFolders = false;
+              paused = false;
+            };
+          in
+          {
+            server.id = "BG6PF7S-KATABWO-7WAZFMX-6YO7IS3-WQTMR3M-VSOSV7V-HFFMNNH-BFX2EQ4";
+            miniserver.id = "HDYEGIR-GFU7ONK-MOOJUFH-N3L3XHX-SXWN3FI-O23K6LD-BJENQK5-VIPV2AT";
+            workstation.id = "4E4KJ6M-MSTNBVF-D7CNHDW-DUTB3VR-SXKZ4NH-ZKAOMF5-V24JECJ-4STSZAA";
+            galaxy.id = "UAZ5YDV-YUFBXOY-QMS6S6R-WPIIKZI-4OPPW5L-G4OVUPO-YW5KFYY-YASRAAV";
+            phone.id = "OSOX2VZ-AO2SA3C-BFB6NKF-K6CR6WX-64TDBKW-RRKEKJ4-FKZE5CV-J2RGJAJ";
+            wg-friend1 = mkWgDevice "wg-friend1" "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
+            wg-friend2 = mkWgDevice "wg-friend2" "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
+            wg-friend3 = mkWgDevice "wg-friend3" "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
+            wg-friend4 = mkWgDevice "wg-friend4" "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
           };
-          wg-friend2 = {
-            id = "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
-            addresses = [ "tcp://${config.my.ips.wg-friend2}:22000" ];
-            introducer = false;
-            autoAcceptFolders = false;
-            paused = false;
-          };
-          wg-friend3 = {
-            id = "XBIYCD4-EFKS5SK-WFF73CU-P37GXVH-OMWEIA4-6KC5F3L-U5UQWSF-SYNNRQF";
-            addresses = [ "tcp://${config.my.ips.wg-friend3}:22000" ];
-            introducer = false;
-            autoAcceptFolders = false;
-            paused = false;
-          };
-        };
         folders = {
           cache = mkMobile "~/Downloads/cache/";
           friends = mkMobile "~/Pictures/Artist/friends/";
@@ -122,6 +115,19 @@ in
             path = "~/Pictures/Encrypted/friends";
             ignorePerms = false;
             type = "sendreceive";
+            devices = [
+              "server"
+              "workstation"
+              "wg-friend1"
+              "wg-friend2"
+              "wg-friend3"
+              "wg-friend4"
+            ];
+          };
+          family_share = {
+            path = "~/Pictures/Encrypted/family";
+            ignorePerms = false;
+            type = "sendreceive";
             devices = [
               "server"
               "workstation"