From e8e0758417aa4542b85bd4b66245e09d6f4d5ca2 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 5 Dec 2023 10:33:48 +0100
Subject: [PATCH] Adapt Syncthing to upstream changes

---
 modules/datasync.nix | 120 ++++++++++++++++++++++---------------------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/modules/datasync.nix b/modules/datasync.nix
index 0268b23..44e98f2 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -7,80 +7,82 @@
     guiAddress = "0.0.0.0:8384";
     dataDir = "/vault/syncthing";
     key = config.age.secrets.syncthing.path;
-    devices = {
-      panacea.id =
-        "NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
-      caravanserai.id =
-        "MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
-    };
     extraOptions = {
       options = {
         maxFolderConcurrency = 4;
         progressUpdateIntervalS = -1;
       };
     };
-    folders = {
-      Documents = {
-        id = "wusdj-bfjkr";
-        type = "receiveonly";
-        path = "/vault/syncthing/Documents";
-        devices = [ "panacea" "caravanserai" ];
+    settings = {
+      devices = {
+        panacea.id =
+          "NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
+        caravanserai.id =
+          "MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
       };
+      folders = {
+        Documents = {
+          id = "wusdj-bfjkr";
+          type = "receiveonly";
+          path = "/vault/syncthing/Documents";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Notes = {
-        id = "kafhz-bfmzm";
-        type = "receiveonly";
-        path = "/vault/syncthing/Notes";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Notes = {
+          id = "kafhz-bfmzm";
+          type = "receiveonly";
+          path = "/vault/syncthing/Notes";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Music = {
-        id = "2aqt7-vpprc";
-        type = "receiveonly";
-        path = "/vault/syncthing/Music";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Music = {
+          id = "2aqt7-vpprc";
+          type = "receiveonly";
+          path = "/vault/syncthing/Music";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Photos = {
-        id = "mjibc-ustcg";
-        type = "receiveonly";
-        path = "/vault/syncthing/Photos";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Photos = {
+          id = "mjibc-ustcg";
+          type = "receiveonly";
+          path = "/vault/syncthing/Photos";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Projects = {
-        id = "cjhmu-avy9v";
-        type = "receiveonly";
-        path = "/vault/syncthing/Projects";
-        devices = [ "panacea" ];
-      };
+        Projects = {
+          id = "cjhmu-avy9v";
+          type = "receiveonly";
+          path = "/vault/syncthing/Projects";
+          devices = [ "panacea" ];
+        };
 
-      Phone = {
-        id = "m2007j20cg_vc7r-photos";
-        type = "receiveonly";
-        path = "/vault/syncthing/Photos/Phone";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Phone = {
+          id = "m2007j20cg_vc7r-photos";
+          type = "receiveonly";
+          path = "/vault/syncthing/Photos/Phone";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Files = {
-        id = "tsk52-u6rbk";
-        type = "receiveonly";
-        path = "/vault/syncthing/Files";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Files = {
+          id = "tsk52-u6rbk";
+          type = "receiveonly";
+          path = "/vault/syncthing/Files";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Phone-screenshots = {
-        id = "pp70r-pbr70";
-        type = "receiveonly";
-        path = "/vault/syncthing/Photos/Phone-screenshots";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Phone-screenshots = {
+          id = "pp70r-pbr70";
+          type = "receiveonly";
+          path = "/vault/syncthing/Photos/Phone-screenshots";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Audio = {
-        id = "tarrs-5mxck";
-        type = "receiveonly";
-        path = "/vault/syncthing/Audio";
-        devices = [ "panacea" "caravanserai" ];
+        Audio = {
+          id = "tarrs-5mxck";
+          type = "receiveonly";
+          path = "/vault/syncthing/Audio";
+          devices = [ "panacea" "caravanserai" ];
+        };
       };
     };
   };