From 9385a07586623a97629754fe7edaf2b17cf3dea8 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Fri, 13 Oct 2023 21:11:40 -0700
Subject: [PATCH] add declarative syncthing config for Torus and remove module

---
 provision/hosts/kestrel/configuration.nix |  1 -
 provision/hosts/torus/configuration.nix   |  4 ++--
 provision/hosts/torus/syncthing.nix       | 15 +++++++++++++++
 provision/modules/services/default.nix    |  2 +-
 provision/modules/services/syncthing.nix  | 15 ---------------
 5 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 provision/hosts/torus/syncthing.nix
 delete mode 100644 provision/modules/services/syncthing.nix

diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 6cfa0a00..dc5e3d9a 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -94,7 +94,6 @@
       jellyfin.enable = false;
       peripherals.enable = true;
       samba-client.enable = true;
-      syncthing.enable = false;
       virt-manager.enable = true;
     };
     system = {
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index 4f441c6a..90789cee 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -1,9 +1,10 @@
 { config, pkgs, user, lib, ... }:
 {
   imports = [ 
+    ../../modules 
     ./wireguard-server.nix
     ./samba-server.nix
-    ../../modules 
+    ./syncthing.nix
   ];
 
   nix = {
@@ -130,7 +131,6 @@
     };
     services = {
       jellyfin.enable = true;
-      syncthing.enable = true;
     };
     system = {
       terminal.enable = true;
diff --git a/provision/hosts/torus/syncthing.nix b/provision/hosts/torus/syncthing.nix
new file mode 100644
index 00000000..980ef1cb
--- /dev/null
+++ b/provision/hosts/torus/syncthing.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, user, ... }:
+{
+  environment.systemPackages = with pkgs; [ syncthing ];
+  services.syncthing = {
+    enable = true;
+    user = "${user}";
+    configDir = "/home/${user}/.config/syncthing";
+    overrideDevices = true;
+    overrideFolders = true; 
+    devices = {
+    };
+    folders = {
+    };
+  };
+}
diff --git a/provision/modules/services/default.nix b/provision/modules/services/default.nix
index 2cd18a94..bd6cf36b 100644
--- a/provision/modules/services/default.nix
+++ b/provision/modules/services/default.nix
@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./syncthing.nix ./samba-client.nix ./jellyfin.nix ./virt-manager.nix ./peripherals.nix ];
+  imports = [ ./samba-client.nix ./jellyfin.nix ./virt-manager.nix ./peripherals.nix ];
 }
diff --git a/provision/modules/services/syncthing.nix b/provision/modules/services/syncthing.nix
deleted file mode 100644
index aae7d8b4..00000000
--- a/provision/modules/services/syncthing.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.services.syncthing;
-in {
-  options.modules.services.syncthing.enable = lib.mkEnableOption "syncthing";
-  config = lib.mkIf cfg.enable {
-
-    environment.systemPackages = with pkgs; [ syncthing ];
-    services.syncthing = {
-      enable = true;
-      user = "${user}";
-      configDir = "/home/${user}/.config/syncthing";
-    };
-  };
-}