syncthing: split into l and krebs

2 files changed, 18 insertions, 10 deletions

diff --git a/krebs/2configs/syncthing.nix b/krebs/2configs/syncthing.nix
new file mode 100644
index 000000000..31e33ad5e
--- /dev/null
+++ b/krebs/2configs/syncthing.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }: with import <stockholm/lib>; let
+  mk_peers = mapAttrs (n: v: { id = v.syncthing.id; });
+
+  all_peers = filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts;
+  used_peer_names = unique (flatten (mapAttrsToList (n: v: v.devices) config.services.syncthing.declarative.folders));
+  used_peers = filterAttrs (n: v: elem n used_peer_names) all_peers;
+in {
+  services.syncthing = {
+    enable = true;
+    configDir = "/var/lib/syncthing";
+    declarative = {
+      devices = mk_peers used_peers;
+    };
+  };
+}
diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix
index 50f282640..e288df68a 100644
--- a/lass/2configs/syncthing.nix
+++ b/lass/2configs/syncthing.nix
@@ -1,18 +1,11 @@
-{ config, pkgs, ... }: with import <stockholm/lib>; let
-  mk_peers = mapAttrs (n: v: { id = v.syncthing.id; });
-
-  all_peers = filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts;
-  used_peer_names = unique (flatten (mapAttrsToList (n: v: v.devices) config.services.syncthing.declarative.folders));
-  used_peers = filterAttrs (n: v: elem n used_peer_names) all_peers;
-in {
+{ config, pkgs, ... }: with import <stockholm/lib>;
+{
+  imports = [ <stockholm/krebs/2configs/syncthing.nix> ];
   services.syncthing = {
-    enable = true;
     group = "syncthing";
-    configDir = "/var/lib/syncthing";
     declarative = {
       key = toString <secrets/syncthing.key>;
       cert = toString <secrets/syncthing.cert>;
-      devices = mk_peers used_peers;
     };
   };
   krebs.iptables.tables.filter.INPUT.rules = [