From 6b52c230fd426b0790a5875513772b9f144036f8 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Wed, 31 May 2023 16:25:30 -0700
Subject: [PATCH] syncthing workingish

---
 systems/aurora.nix |  8 +++----
 users/jsutter.nix  | 56 +++++++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/systems/aurora.nix b/systems/aurora.nix
index 5ef7c12..69c78a7 100755
--- a/systems/aurora.nix
+++ b/systems/aurora.nix
@@ -11,10 +11,10 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-#  fileSystems."/mnt/data" =
-#    { device = "/dev/disk/by-partlabel/data/";
-#      fsType = "btrfs";
-#    };
+  fileSystems."/mnt/data" =
+    { device = "/dev/disk/by-partlabel/data";
+      fsType = "ext4";
+    };
 
   services.xserver.videoDrivers = [ "amdgpu" ];
 
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 421b4e9..776b0ad 100755
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -23,7 +23,7 @@ in
     shell = pkgs.zsh;
     isNormalUser = true;
     description = "Julian Sutter";
-    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "libvirtd" ];
+    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "libvirtd" "syncthing" ];
     hashedPassword = "$6$tvkhGd24G6pVOsWr$j8ZAqSnXPTGwMGmIulU5Puzqd4iKdu8eAMSFis/cPqTW6u2xGQMqPHH1W9IZwKSL6.nS7Jc/NR2VwpPosyXDH/";
     openssh.authorizedKeys.keys  = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNVUh+RrcOSMRV6qysnsdPs5AyK8dSm4QhhnwgpikyI jsutter@symbiotrip.com" ];
     packages = with pkgs; [
@@ -65,36 +65,39 @@ in
   # Syncthing
   services.syncthing = {
     enable = true;
-    dataDir = "/mnt/data";
+    systemService = true;
     configDir = "/home/jsutter/.config/syncthing";
+    user    = "jsutter";
+    group   = "users";
+    dataDir = "/mnt/data";
     overrideDevices = true;     # overrides any devices added or deleted through the WebUI
     overrideFolders = true;     # overrides any folders added or deleted through the WebUI
-    extraOptions.gui = {
-      user = "admin";
-      password = "Monaco55";
-    };
-    devices = {
-      "app01" = { id = "N22JOMX-FNT3BFV-HQDZJR7-X6Y4HKF-N5WX5NU-BMABJJ6-UGIRJPQ-MQT77QB"; };
-#     "dummy" = { id = "DEVICE-ID-GOES-HERE"; };
-#     "aurora" = { id = "DEVICE-ID-GOES-HERE"; };
-#     "framework" = { id = "DEVICE-ID-GOES-HERE"; };
-    };
-    folders = {
-      "jsutter" = { 
-        path = "/home/jsutter"; 
-        devices = [ "app01" ]; 
-        versioning = { 
-          type = "staggered"; 
-          params = { 
-            cleanInterval = "3600"; 
-            maxAge = "15768000";
-          }; 
-        }; 
+    settings = {
+      extraOptions.gui = {
+        user = "admin";
+        password = "Monaco55";
       };
+      devices = {
+        "app01" = { id = "N22JOMX-FNT3BFV-HQDZJR7-X6Y4HKF-N5WX5NU-BMABJJ6-UGIRJPQ-MQT77QB"; };
+  #     "dummy" = { id = "DEVICE-ID-GOES-HERE"; };
+       "aurora" = { id = "3P5ZTBW-MJ2QITD-D2QGI6I-NVNRMLC-SMTK7VF-VQYH4V7-FSVPVDT-ZR6FVQU"; };
+  #     "framework" = { id = "DEVICE-ID-GOES-HERE"; };
+      };
+#      folders = {
+#        "jsutter" = { 
+#          path = "/home/jsutter/sync"; 
+#          devices = [ "app01" "aurora" ]; 
+#          versioning = { 
+#            type = "staggered"; 
+#            params = { 
+#              cleanInterval = "3600"; 
+#              maxAge = "15768000";
+#            }; 
+#          }; 
+#        };
+#      };
     };
-  networking.firewall.allowedTCPPorts = [ 8384 22000 ];
-  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
-
+  };
 
   #Everything below is home manager managed:
   home-manager = {
@@ -104,6 +107,7 @@ in
       home.homeDirectory = "/home/jsutter";
       programs.home-manager.enable = true;
       home.stateVersion = "23.05";
+      services.syncthing.tray.enable = true;
 
     # Git Configuration
       programs.git = {