From 5e10a2c3c9033f6b743dfd2764cbf2492f2d47a3 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Sat, 26 Oct 2024 19:35:43 -0700
Subject: [PATCH] move syncthing to services

---
 provision/hosts/bulwark/configuration.nix              | 8 ++++----
 provision/hosts/kestrel/configuration.nix              | 8 ++++----
 provision/modules/programs/default.nix                 | 1 -
 provision/modules/services/default.nix                 | 1 +
 provision/modules/{programs => services}/syncthing.nix | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename provision/modules/{programs => services}/syncthing.nix (93%)

diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index 851091a9..fc86d154 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -31,6 +31,10 @@
     programs = {
       chezmoi.apply = true;
       kitty.enable = true;
+    };
+    services = {
+      samba-client.enable = true;
+      ssh.enable = true;
       syncthing = {
         enable = true;
         keyPath = ../../secrets/syncthing/bulwark/key.pem.age;
@@ -40,9 +44,5 @@
         };
       };
     };
-    services = {
-      samba-client.enable = true;
-      ssh.enable = true;
-    };
   };
 }
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 1aba0f1f..9c78745f 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -53,6 +53,10 @@
       chezmoi.apply = true;
       kitty.enable = true;
       virt-manager.enable = true;
+    };
+    services = {
+      samba-client.enable = true;
+      ssh.enable = true;
       syncthing = {
         enable = true;
         keyPath = ../../secrets/syncthing/kestrel/key.pem.age;
@@ -62,9 +66,5 @@
         };
       };
     };
-    services = {
-      samba-client.enable = true;
-      ssh.enable = true;
-    };
   };
 }
diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix
index ac750cbf..3604682d 100644
--- a/provision/modules/programs/default.nix
+++ b/provision/modules/programs/default.nix
@@ -10,7 +10,6 @@
     ./chezmoi.nix 
     ./kitty.nix
     ./nvim.nix
-    ./syncthing.nix
     ./virt-manager.nix
     ./yt-dlp.nix
   ];
diff --git a/provision/modules/services/default.nix b/provision/modules/services/default.nix
index 35c9a3d4..76ebed28 100644
--- a/provision/modules/services/default.nix
+++ b/provision/modules/services/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./samba-client.nix 
     ./ssh.nix
+    ./syncthing.nix
   ];
 }
diff --git a/provision/modules/programs/syncthing.nix b/provision/modules/services/syncthing.nix
similarity index 93%
rename from provision/modules/programs/syncthing.nix
rename to provision/modules/services/syncthing.nix
index 068c3ed4..f13a7a8b 100644
--- a/provision/modules/programs/syncthing.nix
+++ b/provision/modules/services/syncthing.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg = config.modules.programs.syncthing;
+let cfg = config.modules.services.syncthing;
 in {
-  options.modules.programs.syncthing = with lib; {
+  options.modules.services.syncthing = with lib; {
     enable = lib.mkOption {
       type = types.bool;
       default = false;