From cf255939d502db57c32e0a03b04f1ad5c6a81f93 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Tue, 18 Jul 2023 18:11:07 +0300
Subject: [PATCH] Fixed big syncthing oopsie

---
 hosts/nixos/common/optional/syncthing.nix  |  4 +++-
 hosts/nixos/lapetus/services/syncthing.nix |  1 -
 hosts/nixos/tethys/services/syncthing.nix  | 24 +++++++++-------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/hosts/nixos/common/optional/syncthing.nix b/hosts/nixos/common/optional/syncthing.nix
index b89feaa..19551ab 100644
--- a/hosts/nixos/common/optional/syncthing.nix
+++ b/hosts/nixos/common/optional/syncthing.nix
@@ -16,7 +16,9 @@ in
     overrideFolders = true;
 
     devices = {
-      "enceladus" = { id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM"; };
+      enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
+      lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
+      tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
     };
 
     extraOptions = {
diff --git a/hosts/nixos/lapetus/services/syncthing.nix b/hosts/nixos/lapetus/services/syncthing.nix
index ed188bf..b6412e9 100644
--- a/hosts/nixos/lapetus/services/syncthing.nix
+++ b/hosts/nixos/lapetus/services/syncthing.nix
@@ -4,7 +4,6 @@
   networking.firewall.allowedTCPPorts = [ 8384 ];
 
   services.syncthing = {
-    devices.lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
     guiAddress = "0.0.0.0:8384"; # TODO: put this behind nginx
 
     folders = { };
diff --git a/hosts/nixos/tethys/services/syncthing.nix b/hosts/nixos/tethys/services/syncthing.nix
index 81088ba..031e842 100644
--- a/hosts/nixos/tethys/services/syncthing.nix
+++ b/hosts/nixos/tethys/services/syncthing.nix
@@ -1,21 +1,17 @@
 {
   imports = [ ../../common/optional/syncthing.nix ];
 
-  services.syncthing = {
-    devices.tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
+  services.syncthing.folders = {
+    "stellar-sanctum" = {
+      path = "/home/adrielus/Projects/stellar-sanctum/";
+      devices = [ "enceladus" "lapetus" ];
 
-    folders = {
-      "stellar-sanctum" = {
-        path = "/home/adrielus/Projects/stellar-sanctum/";
-        devices = [ "enceladus" "lapetus" ];
-
-        # TODO: remove this once I switch to zfs
-        versioning = {
-          type = "staggered";
-          params = {
-            cleanInterval = "3600"; # 1 hour in seconds
-            maxAge = "604800"; # 14 days in seconds.
-          };
+      # TODO: remove this once I switch to zfs
+      versioning = {
+        type = "staggered";
+        params = {
+          cleanInterval = "3600"; # 1 hour in seconds
+          maxAge = "604800"; # 14 days in seconds.
         };
       };
     };