From 9685fb8b07b5d291c87885f7d6252ebc418bb643 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Tue, 22 Oct 2024 21:11:54 -0700
Subject: [PATCH] remove syncthing for torus and shivan

---
 provision/hosts/bulwark/configuration.nix |  1 -
 provision/hosts/kestrel/configuration.nix |  5 ++--
 provision/hosts/shivan/configuration.nix  |  1 -
 provision/hosts/shivan/syncthing.nix      | 28 -----------------------
 provision/hosts/torus/configuration.nix   |  1 -
 provision/hosts/torus/syncthing.nix       | 24 -------------------
 provision/modules/services/syncthing.nix  |  9 --------
 7 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 provision/hosts/shivan/syncthing.nix
 delete mode 100644 provision/hosts/torus/syncthing.nix

diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index d8921395..33c4b0e4 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -41,7 +41,6 @@
         devices = {
           "kestrel" = { id = "5WWL4FE-ARZ4FHP-J33HQCH-CZKEXLN-2RAY4KW-PDI754F-3HVPZYI-VC3ESAF"; };
         };
-        folders = {};
       };
     };
     system = {
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 2231f984..f7a48fd3 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -60,8 +60,9 @@
         enable = true;
         keyPath = ../../secrets/syncthing/kestrel/key.pem.age;
         certPath = ../../secrets/syncthing/kestrel/cert.pem.age;
-        devices = {};
-        folders = {};
+        devices = {
+          "bulwark" = { id = "YKPOWTQ-XMXG3SD-XKLPVEC-H4SO345-2ZZQK65-EBISRED-ISKCFMQ-T74P6Q5"; };
+        };
       };
     };
     system = {
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index aa4931b8..f58323e3 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -1,7 +1,6 @@
 { config, pkgs, user, lib, ... }:
 {
   imports = [ 
-    ./syncthing.nix
   ];
 
   # Use performance governor for sweet gaming performance!
diff --git a/provision/hosts/shivan/syncthing.nix b/provision/hosts/shivan/syncthing.nix
deleted file mode 100644
index 23b28553..00000000
--- a/provision/hosts/shivan/syncthing.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-{
-  networking.firewall.allowedTCPPorts = [ 8384 22000 ];
-  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
-
-  environment.systemPackages = with pkgs; [ 
-    syncthing # File sync program for multiple devices in real-time.
-  ];
-
-  services.syncthing = {
-    enable = true;
-    user = "${user}";
-    dataDir = "/home/${user}/.local/share/syncthing";
-    configDir = "/home/${user}/.config/syncthing";
-    guiAddress = "0.0.0.0:8384";
-    overrideDevices = true;
-    overrideFolders = true; 
-    settings.devices = {
-      "kestrel" = { id = "KYEWTBL-GL343U7-OIM63LT-2IYGJAP-RCL545L-2KJOIY4-6352W6Y-DZRVGAL"; };
-    };
-    settings.folders = {
-      "General Sync" = {
-        path = "/home/${user}/sync";
-        devices = [ "kestrel" ];
-      };
-    };
-  };
-}
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index 8e1dbb4a..8dd81703 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -4,7 +4,6 @@
     ../../modules 
     ./wireguard-server.nix
     ./samba-server.nix
-    ./syncthing.nix
     ./rss.nix
     ./home-assistant
     ./gitea.nix
diff --git a/provision/hosts/torus/syncthing.nix b/provision/hosts/torus/syncthing.nix
deleted file mode 100644
index a1926822..00000000
--- a/provision/hosts/torus/syncthing.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-{
-  networking.firewall.allowedTCPPorts = [ 8384 22000 ];
-  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
-
-  environment.systemPackages = with pkgs; [ 
-    syncthing # File sync program for multiple devices in real-time.
-  ];
-
-  services.syncthing = {
-    enable = true;
-    user = "${user}";
-    dataDir = "/home/${user}/.local/share/syncthing";
-    configDir = "/home/${user}/.config/syncthing";
-    guiAddress = "0.0.0.0:8384";
-    overrideDevices = true;
-    overrideFolders = true; 
-    settings.devices = {
-      "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; };
-    };
-    settings.folders = {
-    };
-  };
-}
diff --git a/provision/modules/services/syncthing.nix b/provision/modules/services/syncthing.nix
index 42e4f931..983ca03f 100644
--- a/provision/modules/services/syncthing.nix
+++ b/provision/modules/services/syncthing.nix
@@ -22,14 +22,6 @@ in {
         A set of devices and associated IDs.
       '';
     };
-    folders = mkOption {
-      type = types.attrs;
-      default = {}; 
-      description = ''
-        A set of folders, each defined by a set of attributes like
-        path, devices, and other configuration options.
-      '';
-    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -62,7 +54,6 @@ in {
       key = "/run/agenix/syncthing/key.pem";
       cert = "/run/agenix/syncthing/cert.pem";
       settings.devices = cfg.devices;
-      settings.folders = cfg.folders;
     };
   };
 }