From 499ff4312375b29f8e099dccdec5eeb3a960ea9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Fri, 17 May 2019 07:25:03 +0200
Subject: [PATCH] syncthing

---
 configs/cloud.nix   | 30 +++++++++++++++++++++---------
 configs/default.nix |  3 +++
 deploy.nix          |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/configs/cloud.nix b/configs/cloud.nix
index a4b378e..5a647c7 100644
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -1,9 +1,11 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   imports = [
     <modules/seafile.nix>
     <modules/google-drive.nix>
     <modules/dropbox.nix>
+    <stockholm/krebs/3modules/permown.nix>
+    <stockholm/krebs/3modules/syncthing.nix>
   ];
 
   niveum.dropbox.enable = true;
@@ -18,17 +20,27 @@
 
   services.syncthing = rec {
     enable = true;
-    # user = config.users.users.me.name;
-    # dataDir = "${config.users.users.me.home}/.config/syncthing";
-    user = "kfm";
-    dataDir = "/home/${user}/.config/syncthing";
+    group = "syncthing";
     openDefaultPorts = true;
+    configDir = "/var/lib/syncthing";
   };
 
-  home-manager.users.me = {
-    services.syncthing = {
-      enable = true;
-      tray = true;
+  krebs.syncthing = rec {
+    enable = true;
+    id = config.networking.hostName;
+    peers = {
+      homeros.id = "TGVJKSM-5P7YP4E-OCYDB6S-LXQ3PNM-RP6BNBS-2UNYKKX-YJCMWAF-NGWQFA2";
+      scardanelli.id = "XEQUNNZ-FQ67ASA-4DWBKAO-RQD2PTK-B6J74TT-RQPBVDE-SRNOSMF-UUAUMAK";
+      rilke.id = "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
     };
+    folders."${config.users.users.me.home}/cloud/syncthing/common".peers = [ "homeros" "scardanelli" ];
+    folders."${config.users.users.me.home}/cloud/syncthing/library".peers = lib.attrNames peers;
+    folders."${config.users.users.me.home}/cloud/syncthing/mundoiu".peers = lib.attrNames peers;
   };
+
+  krebs.permown = with lib; flip mapAttrs config.krebs.syncthing.folders (_: _: {
+    owner = config.users.users.me.name;
+    group = "syncthing";
+    umask = "0007";
+  });
 }
diff --git a/configs/default.nix b/configs/default.nix
index 3041f75..d13b792 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -97,12 +97,15 @@
           nix-git = pkgs.callPackage <packages/nix-git.nix> {};
           odyssey = pkgs.callPackage <packages/odyssey.nix> {};
           wttr = pkgs.callPackage <packages/wttr.nix> {};
+          writeDash = pkgs.writers.writeDash;
+          writeDashBin = pkgs.writers.writeDashBin;
 
           dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> {};
           yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> {};
           acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> {};
           urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> {};
           mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> {};
+          untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> {};
         };
       };
     }
diff --git a/deploy.nix b/deploy.nix
index 43e128c..379ef4d 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -39,7 +39,7 @@ let
     };
     stockholm.git = {
       url = https://cgit.krebsco.de/stockholm;
-      ref = "7e1b197dab13d024ba491c96dc959306324943c0";
+      ref = "1340e3fb";
     };
   });