From 83dad24351a6075d1ddfde6fc2f555f1623f5a82 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sun, 19 Jan 2025 16:18:27 -0500
Subject: [PATCH] moved davids-server.id to jeeves/syncthing.nix

---
 common/optional/syncthing_base.nix |   1 -
 systems/jeeves/syncthing.nix       | 231 +++++++++++++++--------------
 2 files changed, 117 insertions(+), 115 deletions(-)

diff --git a/common/optional/syncthing_base.nix b/common/optional/syncthing_base.nix
index ecb8511..bbbcdc4 100644
--- a/common/optional/syncthing_base.nix
+++ b/common/optional/syncthing_base.nix
@@ -13,7 +13,6 @@
         ipad.id = "KI76T3X-SFUGV2L-VSNYTKR-TSIUV5L-SHWD3HE-GQRGRCN-GY4UFMD-CW6Z6AX"; # cspell:disable-line
         bob.id = "CJIAPEJ-VO74RR4-F75VU6M-QNZAMYG-FYUJG7Y-6AT62HJ-355PRPL-PJFETAZ"; # cspell:disable-line
         rhapsody-in-green.id = "ASL3KC4-3XEN6PA-7BQBRKE-A7JXLI6-DJT43BY-Q4WPOER-7UALUAZ-VTPQ6Q4"; # cspell:disable-line
-        davids-server.id = "7GXTDGR-AOXFW2O-K6J7NM3-XYZNRRW-AKHAFWM-GBOWUPQ-OA6JIWD-ER7RDQL"; # cspell:disable-line
       };
     };
   };
diff --git a/systems/jeeves/syncthing.nix b/systems/jeeves/syncthing.nix
index 3bf0c99..949bd25 100644
--- a/systems/jeeves/syncthing.nix
+++ b/systems/jeeves/syncthing.nix
@@ -6,120 +6,123 @@ in
   
   services.syncthing = {
     guiAddress = "192.168.90.40:8384";
-    settings.folders = {
-      "dotfiles" = {
-        path = "/home/richie/dotfiles";
-        devices = [
-          "bob"
-          "rhapsody-in-green"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "notes" = {
-        id = "l62ul-lpweo"; # cspell:disable-line
-        path = vars.media_notes;
-        devices = [
-          "rhapsody-in-green"
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "important" = {
-        id = "4ckma-gtshs"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/important";
-        devices = [
-          "bob"
-          "rhapsody-in-green"
-          "phone"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "music" = {
-        id = "vprc5-3azqc"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/music";
-        devices = [
-          "bob"
-          "rhapsody-in-green"
-          "ipad"
-          "phone"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "projects" = {
-        id = "vyma6-lqqrz"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/projects";
-        devices = [
-          "rhapsody-in-green"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "rhapsody-in-green_temp" = {
-        path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
-        devices = [
-          "rhapsody-in-green"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "vault" = {
-        path = "/home/richie/vault";
-        devices = [
-          "rhapsody-in-green"
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-      };
-      "backup" = {
-        path = "${vars.storage_syncthing}/backup";
-        devices = [
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-      };
-      # 
-      "davids-backup1" = {
-        id = "8229p-8z3tm"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/davids_backups/1";
-        devices = [
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-        type = "receiveencrypted";
-      };
-      "davids-backup2" = {
-        id = "iciw3-dp6ao"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/davids_backups/2";
-        devices = [
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-        type = "receiveencrypted";
-      };
-      "davids-backup3" = {
-        id = "9si6m-bnkjb"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/davids_backups/3";
-        devices = [
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-        type = "receiveencrypted";
-      };
-      "davids-backup4" = {
-        id = "qjyfy-uupj4"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/davids_backups/4";
-        devices = [
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-        type = "receiveencrypted";
-      };
-      "davids-backup5" = {
-        id = "fm4h5-emsu2"; # cspell:disable-line
-        path = "${vars.storage_syncthing}/davids_backups/5";
-        devices = [
-          "davids-server"
-        ];
-        fsWatcherEnabled = true;
-        type = "receiveencrypted";
+    settings = {
+      devices.davids-server.id = "7GXTDGR-AOXFW2O-K6J7NM3-XYZNRRW-AKHAFWM-GBOWUPQ-OA6JIWD-ER7RDQL"; # cspell:disable-line
+      folders = {
+        "dotfiles" = {
+          path = "/home/richie/dotfiles";
+          devices = [
+            "bob"
+            "rhapsody-in-green"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "notes" = {
+          id = "l62ul-lpweo"; # cspell:disable-line
+          path = vars.media_notes;
+          devices = [
+            "rhapsody-in-green"
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "important" = {
+          id = "4ckma-gtshs"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/important";
+          devices = [
+            "bob"
+            "rhapsody-in-green"
+            "phone"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "music" = {
+          id = "vprc5-3azqc"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/music";
+          devices = [
+            "bob"
+            "rhapsody-in-green"
+            "ipad"
+            "phone"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "projects" = {
+          id = "vyma6-lqqrz"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/projects";
+          devices = [
+            "rhapsody-in-green"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "rhapsody-in-green_temp" = {
+          path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
+          devices = [
+            "rhapsody-in-green"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "vault" = {
+          path = "/home/richie/vault";
+          devices = [
+            "rhapsody-in-green"
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+        };
+        "backup" = {
+          path = "${vars.storage_syncthing}/backup";
+          devices = [
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+        };
+        # 
+        "davids-backup1" = {
+          id = "8229p-8z3tm"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/davids_backups/1";
+          devices = [
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+          type = "receiveencrypted";
+        };
+        "davids-backup2" = {
+          id = "iciw3-dp6ao"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/davids_backups/2";
+          devices = [
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+          type = "receiveencrypted";
+        };
+        "davids-backup3" = {
+          id = "9si6m-bnkjb"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/davids_backups/3";
+          devices = [
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+          type = "receiveencrypted";
+        };
+        "davids-backup4" = {
+          id = "qjyfy-uupj4"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/davids_backups/4";
+          devices = [
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+          type = "receiveencrypted";
+        };
+        "davids-backup5" = {
+          id = "fm4h5-emsu2"; # cspell:disable-line
+          path = "${vars.storage_syncthing}/davids_backups/5";
+          devices = [
+            "davids-server"
+          ];
+          fsWatcherEnabled = true;
+          type = "receiveencrypted";
+        };
       };
     };
   };