move syncthing to services

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;
-    };
   };
 }

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;
-    };
   };
 }

provision/modules/programs/default.nix

@@ -10,7 +10,6 @@
     ./chezmoi.nix 
     ./kitty.nix
     ./nvim.nix
-    ./syncthing.nix
     ./virt-manager.nix
     ./yt-dlp.nix
   ];

provision/modules/services/default.nix

@@ -3,5 +3,6 @@
   imports = [
     ./samba-client.nix 
     ./ssh.nix
+    ./syncthing.nix
   ];
 }

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;