From 3a54ab758168df4dc21e6b7eec6f4038fda31f81 Mon Sep 17 00:00:00 2001
From: Payas Relekar <payas@relekar.org>
Date: Sat, 5 Aug 2023 18:27:20 +0530
Subject: [PATCH] Fix and enable Syncthing with newer options

---
 hosts/bebop/syncthing.nix    | 50 ++++++++++++++++++------------------
 modules/common-syncthing.nix |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/hosts/bebop/syncthing.nix b/hosts/bebop/syncthing.nix
index be8c93c..9a87722 100644
--- a/hosts/bebop/syncthing.nix
+++ b/hosts/bebop/syncthing.nix
@@ -1,8 +1,6 @@
 { ... }:
 # TODO:
 #   - Setup certificates and keys declaratively? This will be a real possibility of depending on my SSH key for a whole lotta stuff. Perhaps keep that for future
-#   - Add more folders and devices in declarative way
-#   - Make ALL the devices use this declaratively :)
 {
   imports = [
     ../../modules/common-syncthing.nix
@@ -20,34 +18,36 @@
     # Always use this in combination with above networing config to limit the access from outside LAN
     guiAddress = "0.0.0.0:8384";
 
-    folders = {
-      Keepass = {
-        devices = [ "hermes" "Childish Tycoon" ];
-        type = "receiveonly";
-        versioning = {
-          type = "simple";
-          params.keep = "10";
+    settings = {
+      folders = {
+        Keepass = {
+          devices = [ "hermes" "Childish Tycoon" ];
+          type = "receiveonly";
+          versioning = {
+            type = "simple";
+            params.keep = "10";
+          };
         };
-      };
 
-      Syncthing = {
-        devices = [ "hermes" "Childish Tycoon" ];
-        type = "receiveonly";
-        versioning = {
-          type = "simple";
-          params.keep = "3";
+        Syncthing = {
+          devices = [ "hermes" "Childish Tycoon" ];
+          type = "receiveonly";
+          versioning = {
+            type = "simple";
+            params.keep = "3";
+          };
         };
-      };
 
-      org = {
-        devices = [ "hermes" "Childish Tycoon" ];
-        type = "receiveonly";
-      };
+        org = {
+          devices = [ "hermes" "Childish Tycoon" ];
+          type = "receiveonly";
+        };
 
-      Music = {
-        devices = [ "hermes" "Childish Tycoon" ];
-        type = "receiveonly";
-        fsWatcherEnabled = true;
+        Music = {
+          devices = [ "hermes" "Childish Tycoon" ];
+          type = "receiveonly";
+          fsWatcherEnabled = true;
+        };
       };
     };
   };
diff --git a/modules/common-syncthing.nix b/modules/common-syncthing.nix
index 99c9959..8124e6c 100644
--- a/modules/common-syncthing.nix
+++ b/modules/common-syncthing.nix
@@ -9,7 +9,7 @@ in
   #   - Make ALL the nodes use this declaratively :)
 {
   services.syncthing = {
-    enable = false;
+    enable = true;
     openDefaultPorts = true;
     user = payas;
     group = payas;