refactor

modules/services/syncthing.nix

@@ -1,14 +1,10 @@
 { config, lib, ... }:
 let
-  cfg = config.modules.services.syncthing;
+  cfg = config.services.syncthing;
   fqdn = "${cfg.subdomain}.${config.networking.domain}";
 in
 {
-  options.modules.services.syncthing = {
-    enable = lib.mkEnableOption "Enable Syncthing";
-    dataDir = lib.mkOption {
-      type = lib.types.str;
-    };
+  options.services.syncthing = {
     subdomain = lib.mkOption {
       type = lib.types.str;
     };
@@ -20,14 +16,12 @@ in
 
   config = lib.mkIf cfg.enable {
     services.syncthing = {
-      enable = true;
-      dataDir = cfg.dataDir;
       openDefaultPorts = true;
       guiAddress = "[::1]:${toString cfg.port}";
       settings.gui.insecureSkipHostCheck = true;
     };
 
-    modules.services.webserver = {
+    services.webserver = {
       enable = lib.mkDefault true;
       vHosts.${fqdn}.locations."/".proxyPort = cfg.port;
     };