From 7de42b8acd10b0f67834cf496a2f0703e17d49a3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Sun, 30 Jul 2023 16:15:32 +0100
Subject: [PATCH] Change device groups and default location for Notes

---
 services/syncthing/default.nix | 48 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix
index 4e4e4fed..d3937c03 100644
--- a/services/syncthing/default.nix
+++ b/services/syncthing/default.nix
@@ -1,11 +1,10 @@
-{lib, ...}: let
+{ lib, ... }:
+let
   defaultDataDir = "/var/lib/syncthing";
   deviceGroups = {
-    all = ["Ion" "Legion" "Monarch" "Ronin" "Vanguard"];
-    personal = ["Ion" "Legion" "Monarch" "Vanguard"];
-    work = ["Ion" "Legion" "Ronin"];
-    desktops = ["Legion" "Vanguard"];
-    mobile = ["Ion" "Legion" "Monarch" "Ronin"];
+    all = [ "Ion" "Legion" "Monarch" ];
+    personal = [ "Legion" "Monarch" ];
+    work = [ "Ion" "Legion" "Monarch" "Ronin" ];
   };
 in {
   services.syncthing = {
@@ -15,67 +14,66 @@ in {
     openDefaultPorts = true;
     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";
+        "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";
+        "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;
+          devices = deviceGroups.personal;
         };
         "Books" = {
           id = "zjmxy-ycmbq";
           path = lib.mkDefault "~/Documents/Books";
           ignorePerms = true;
-          devices = deviceGroups.desktops;
+          devices = deviceGroups.personal;
         };
         "Comics" = {
           id = "kc2h0-q3wot";
           path = lib.mkDefault "~/Documents/Comics";
           ignorePerms = true;
-          devices = deviceGroups.desktops;
+          devices = deviceGroups.personal;
         };
         "Documents" = {
           id = "qc6qa-bipsd";
           path = lib.mkDefault "~/Documents/Sync";
           ignorePerms = true;
-          devices = deviceGroups.desktops;
+          devices = deviceGroups.personal;
         };
         "Exports" = {
           id = "tof2e-pdtde";
           path = lib.mkDefault "~/Documents/Exports";
           ignorePerms = true;
-          devices = deviceGroups.desktops;
+          devices = deviceGroups.personal;
         };
         "Notes" = {
           id = "4ggjz-5dyop";
-          path = lib.mkDefault "~/notes";
+          path = lib.mkDefault "~/Notes";
           ignorePerms = true;
-          devices = deviceGroups.all;
+          devices = deviceGroups.work;
         };
         "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;
+          devices = deviceGroups.work;
         };
       };
     };