diff --git a/home/home.nix b/home/home.nix
index dddf52f..c0222b3 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -267,29 +267,57 @@ in
 
   services = {
     syncthing = {
-      enable = false;
+      enable = true;
+      # dataDir = "/home/chris";
+      # openDefaultPorts = true;
+      # configDir = "/home/chris/.config/syncthing";
+      # user = "chris";
+      # group = "users";
+      guiAddress = "0.0.0.0:8384";
+      overrideFolders = true;
+      overrideDevices = true;
+      tray.enable = true;
       settings = {
         devices = {
+          kaladin = {
+            id = (if laptop then "4MQVV7D-WMZ6TZQ-2OSJCHO-ZCOCUCK-DXZLDM4-PWBHJHS-PMI45EH-QGIMAAJ" else "");
+          };
+          syl = {
+            id = (if laptop then "" else "AJMADOK-TENODAA-VSOEW2A-4RXY2XI-YNHIS7H-H3ZYAO5-3UQ64EE-O2N5BAY");
+          };
+          shadow = {
+            id = "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV";
+          };
+          tablet = {
+            id = "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5";
+          };
+          kohlin = {
+            id = "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ";
+          };
           dalinar = {
             id = "MPRMA33-XHW6SRE-D2EDBCP-TSMRNGI-ZCE2TAN-FE4BMKA-PSKGYJW-CRIEJQL";
           };
         };
         folders = {
-          "~/docs" = {
-            id = "docs";
+          docs = {
+            path = "/home/chris/docs";
+            devices = [ (if laptop then "kaladin" else "syl") "shadow" "dalinar" ];
+            # versioning = {
+            #   type = "staggered";
+            #   fsPath = "~/.local/share/syncthing/backup";
+            #   params = {
+            #     cleanInterval = 3600;
+            #     maxAge = 31536000;
+            #   };
+            # };
+          };
+          music = {
+            id = "teqqy-rzvec";
+            path = "/home/chris/music";
             devices = [ "dalinar" ];
-            versioning = {
-              type = "staggered";
-              fsPath = "~/.local/syncthing/backup";
-              params = {
-                cleanInterval = 3600;
-                maxAge = 31536000;
-              };
-            };
           };
         };
       };
-      tray = true;
     };
     easyeffects.enable = true;
     nextcloud-client = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index c9dd8d7..ec40997 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -229,55 +229,56 @@ in
     };
   };
 
-  services.syncthing = {
-    enable = true;
-    dataDir = "/home/chris/.local/share/syncthing";
-    openDefaultPorts = true;
-    configDir = "/home/chris/.config/syncthing";
-    user = "chris";
-    group = "users";
-    guiAddress = "0.0.0.0:8384";
-    overrideFolders = false;
-    settings = {
-      gui = {
-        theme = "dark";
-      };
-      devices = {
-        "syl" = {
-          id = "AJMADOK-TENODAA-VSOEW2A-4RXY2XI-YNHIS7H-H3ZYAO5-3UQ64EE-O2N5BAY";
-        };
-        "kaladin" = {
-          id = "4MQVV7D-WMZ6TZQ-2OSJCHO-ZCOCUCK-DXZLDM4-PWBHJHS-PMI45EH-QGIMAAJ";
-        };
-        "shadow" = {
-          id = "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV";
-        };
-        tablet = {
-          id = "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5";
-        };
-        kohlin = {
-          id = "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ";
-        };
-        "dalinar" = {
-          id = "MPRMA33-XHW6SRE-D2EDBCP-TSMRNGI-ZCE2TAN-FE4BMKA-PSKGYJW-CRIEJQL";
-        };
-      };
-      folders = {
-        "docs" = {
-          path = "/home/chris/docs";
-          devices = [ (if laptop then "kaladin" else "syl") "shadow" "dalinar" ];
-          versioning = {
-            type = "staggered";
-            fsPath = "~/.local/syncthing/backup";
-            params = {
-              cleanInterval = 3600;
-              maxAge = 31536000;
-            };
-          };
-        };
-      };
-    };
-  };
+  # services.syncthing = {
+  #   enable = true;
+  #   dataDir = "/home/chris";
+  #   openDefaultPorts = true;
+  #   configDir = "/home/chris/.config/syncthing";
+  #   user = "chris";
+  #   group = "users";
+  #   guiAddress = "0.0.0.0:8384";
+  #   overrideFolders = true;
+  #   overrideDevices = true;
+  #   settings = {
+  #     gui = {
+  #       theme = "dark";
+  #     };
+  #     devices = {
+  #       syl = {
+  #         id = "AJMADOK-TENODAA-VSOEW2A-4RXY2XI-YNHIS7H-H3ZYAO5-3UQ64EE-O2N5BAY";
+  #       };
+  #       kaladin = {
+  #         id = "4MQVV7D-WMZ6TZQ-2OSJCHO-ZCOCUCK-DXZLDM4-PWBHJHS-PMI45EH-QGIMAAJ";
+  #       };
+  #       shadow = {
+  #         id = "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV";
+  #       };
+  #       tablet = {
+  #         id = "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5";
+  #       };
+  #       kohlin = {
+  #         id = "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ";
+  #       };
+  #       dalinar = {
+  #         id = "MPRMA33-XHW6SRE-D2EDBCP-TSMRNGI-ZCE2TAN-FE4BMKA-PSKGYJW-CRIEJQL";
+  #       };
+  #     };
+  #     folders = {
+  #       docs = {
+  #         path = "/home/chris/docs";
+  #         devices = [ (if laptop then "kaladin" else "syl") "shadow" "dalinar" ];
+  #         versioning = {
+  #           type = "staggered";
+  #           fsPath = "~/.local/syncthing/backup";
+  #           params = {
+  #             cleanInterval = 3600;
+  #             maxAge = 31536000;
+  #           };
+  #         };
+  #       };
+  #     };
+  #   };
+  # };
 
 
   # Android Tools
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index 2d156d7..2bbb975 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -19,6 +19,7 @@
     dash
     dolphin
     okular
+    just
     # guix
     # freecad
     # picard