diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix
index 352b3ce0..4e4e4fed 100644
--- a/services/syncthing/default.nix
+++ b/services/syncthing/default.nix
@@ -13,68 +13,70 @@ in {
     dataDir = lib.mkDefault defaultDataDir;
     systemService = true;
     openDefaultPorts = true;
-    devices = {
-      "Ion".id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";
-      "Legion".id = "6OX54CG-EAQMXKA-K7TXB5P-G5A27HB-52JE2FA-XNAYZU6-YMIDBXP-RKPBJQV";
-      "Monarch".id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";
-      # "Nortstar".id = "";
-      "Ronin".id = "ZOL5YHK-ZZZULIE-UHGVKHW-H5E4BP7-S4CZBOX-OIZVUCV-RZUXOKA-QVBUBAJ";
-      "Vanguard".id = "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK";
-    };
-    folders = {
-      "Archive" = {
-        id = "hwnqy-xzcdx";
-        path = lib.mkDefault "~/Documents/Archive";
-        ignorePerms = true;
-        devices = deviceGroups.desktops;
+    settings = {
+      devices = {
+        "Ion".id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";
+        "Legion".id = "6OX54CG-EAQMXKA-K7TXB5P-G5A27HB-52JE2FA-XNAYZU6-YMIDBXP-RKPBJQV";
+        "Monarch".id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";
+        # "Nortstar".id = "";
+        "Ronin".id = "ZOL5YHK-ZZZULIE-UHGVKHW-H5E4BP7-S4CZBOX-OIZVUCV-RZUXOKA-QVBUBAJ";
+        "Vanguard".id = "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK";
       };
-      "Books" = {
-        id = "zjmxy-ycmbq";
-        path = lib.mkDefault "~/Documents/Books";
-        ignorePerms = true;
-        devices = deviceGroups.desktops;
-      };
-      "Comics" = {
-        id = "kc2h0-q3wot";
-        path = lib.mkDefault "~/Documents/Comics";
-        ignorePerms = true;
-        devices = deviceGroups.desktops;
-      };
-      "Documents" = {
-        id = "qc6qa-bipsd";
-        path = lib.mkDefault "~/Documents/Sync";
-        ignorePerms = true;
-        devices = deviceGroups.desktops;
-      };
-      "Exports" = {
-        id = "tof2e-pdtde";
-        path = lib.mkDefault "~/Documents/Exports";
-        ignorePerms = true;
-        devices = deviceGroups.desktops;
-      };
-      "Notes" = {
-        id = "4ggjz-5dyop";
-        path = lib.mkDefault "~/notes";
-        ignorePerms = true;
-        devices = deviceGroups.all;
-      };
-      "Pictures" = {
-        id = "ziuj8-rm6dn";
-        path = lib.mkDefault "~/Pictures";
-        ignorePerms = true;
-        devices = deviceGroups.personal;
-      };
-      "Tasks" = {
-        id = "qzdat-3zzhw";
-        path = lib.mkDefault "~/.local/share/task";
-        ignorePerms = true;
-        devices = deviceGroups.all;
-      };
-      "Zotero" = {
-        id = "huyvn-liwc9";
-        path = lib.mkDefault "~/Documents/Zotero";
-        ignorePerms = true;
-        devices = deviceGroups.all;
+      folders = {
+        "Archive" = {
+          id = "hwnqy-xzcdx";
+          path = lib.mkDefault "~/Documents/Archive";
+          ignorePerms = true;
+          devices = deviceGroups.desktops;
+        };
+        "Books" = {
+          id = "zjmxy-ycmbq";
+          path = lib.mkDefault "~/Documents/Books";
+          ignorePerms = true;
+          devices = deviceGroups.desktops;
+        };
+        "Comics" = {
+          id = "kc2h0-q3wot";
+          path = lib.mkDefault "~/Documents/Comics";
+          ignorePerms = true;
+          devices = deviceGroups.desktops;
+        };
+        "Documents" = {
+          id = "qc6qa-bipsd";
+          path = lib.mkDefault "~/Documents/Sync";
+          ignorePerms = true;
+          devices = deviceGroups.desktops;
+        };
+        "Exports" = {
+          id = "tof2e-pdtde";
+          path = lib.mkDefault "~/Documents/Exports";
+          ignorePerms = true;
+          devices = deviceGroups.desktops;
+        };
+        "Notes" = {
+          id = "4ggjz-5dyop";
+          path = lib.mkDefault "~/notes";
+          ignorePerms = true;
+          devices = deviceGroups.all;
+        };
+        "Pictures" = {
+          id = "ziuj8-rm6dn";
+          path = lib.mkDefault "~/Pictures";
+          ignorePerms = true;
+          devices = deviceGroups.personal;
+        };
+        "Tasks" = {
+          id = "qzdat-3zzhw";
+          path = lib.mkDefault "~/.local/share/task";
+          ignorePerms = true;
+          devices = deviceGroups.all;
+        };
+        "Zotero" = {
+          id = "huyvn-liwc9";
+          path = lib.mkDefault "~/Documents/Zotero";
+          ignorePerms = true;
+          devices = deviceGroups.all;
+        };
       };
     };
   };