From 0a7cb08c4bf45682b98b6fa443612c20eb3c64ae Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 21 Apr 2022 18:00:30 -0700
Subject: syncthing: enable on tahoe

---
 home/syncthing/default.nix             | 14 --------------
 hosts/tahoe/services.nix               |  1 +
 modules/services/syncthing/default.nix | 18 ++++++++++++------
 3 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 home/syncthing/default.nix

diff --git a/home/syncthing/default.nix b/home/syncthing/default.nix
deleted file mode 100644
index 4e8e4f3..0000000
--- a/home/syncthing/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, config, pkgs, ... }:
-let cfg = config.my.home.syncthing;
-in {
-  options.my.home.syncthing = with lib; {
-    enable = mkEnableOption "syncthing configuration";
-  };
-
-  config.home = {
-    services.syncthing = {
-      enable = true;
-      openDefaultPorts = true;
-    };
-  };
-}
diff --git a/hosts/tahoe/services.nix b/hosts/tahoe/services.nix
index b1ed33f..7de94f6 100644
--- a/hosts/tahoe/services.nix
+++ b/hosts/tahoe/services.nix
@@ -37,6 +37,7 @@ in {
       vhostName = "bt.fcuny.xyz";
     };
     metrics-exporter = { enable = true; };
+    syncthing.enable = true;
     backup = {
       enable = true;
       repository = "/data/slow/backups/systems";
diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix
index 3b6f34f..bbd4fb9 100644
--- a/modules/services/syncthing/default.nix
+++ b/modules/services/syncthing/default.nix
@@ -1,11 +1,17 @@
 { config, pkgs, lib, ... }:
 let cfg = config.my.services.syncthing;
 in {
-  services.syncthing = {
-    enable = true;
-    openDefaultPorts = true;
-    user = config.users.users.fcuny;
-    group = "users";
-    dataDir = "${config.users.users.fcuny.home}/.syncthing";
+  options.my.services.syncthing = with lib; {
+    enable = mkEnableOption "syncthing service";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.syncthing = {
+      enable = true;
+      openDefaultPorts = true;
+      user = users.users.fcuny;
+      group = "users";
+      dataDir = "${users.users.fcuny.home}/.syncthing";
+    };
   };
 }
-- 
cgit 1.4.1