From 9e4d47c5b46a92436d8e71c17a61ab729d4c4133 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Jan 2021 18:20:52 +0100
Subject: l: don't always sync basedir

---
 lass/2configs/syncthing.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'lass/2configs/syncthing.nix')

diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix
index 7758b860..d31ce780 100644
--- a/lass/2configs/syncthing.nix
+++ b/lass/2configs/syncthing.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }: with import <stockholm/lib>; let
   all_peers = filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts;
-  own_peers = filterAttrs (n: v: v.owner.name == "lass") all_peers;
   mk_peers = mapAttrs (n: v: { id = v.syncthing.id; });
 in {
   services.syncthing = {
@@ -11,10 +10,6 @@ in {
       key = toString <secrets/syncthing.key>;
       cert = toString <secrets/syncthing.cert>;
       devices = mk_peers all_peers;
-      folders."/home/lass/sync" = {
-        devices = attrNames (filterAttrs (n: v: n != "phone") own_peers);
-        # ignorePerms = false;
-      };
     };
   };
   krebs.iptables.tables.filter.INPUT.rules = [
@@ -26,11 +21,5 @@ in {
     ${pkgs.coreutils}/bin/chmod a+x /home/lass
   '';
 
-  krebs.permown."/home/lass/sync" = {
-    file-mode = "u+rw,g+rw";
-    owner = "lass";
-    group = "syncthing";
-    umask = "0002";
-    keepGoing = true;
-  };
+  boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
 }
-- 
cgit v1.2.3


From 8e5eb283f4f06a87ab228ad2a0d3a9a6e3ffd737 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Jan 2021 14:47:50 +0100
Subject: l syncthing: just configure used peers

---
 lass/2configs/syncthing.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/syncthing.nix')

diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix
index d31ce780..50f28264 100644
--- a/lass/2configs/syncthing.nix
+++ b/lass/2configs/syncthing.nix
@@ -1,6 +1,9 @@
 { config, pkgs, ... }: with import <stockholm/lib>; let
-  all_peers = filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts;
   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;
@@ -9,7 +12,7 @@ in {
     declarative = {
       key = toString <secrets/syncthing.key>;
       cert = toString <secrets/syncthing.cert>;
-      devices = mk_peers all_peers;
+      devices = mk_peers used_peers;
     };
   };
   krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3


From 550b502628a6e9567fb210c5dba38e9468481efb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Jan 2021 15:06:54 +0100
Subject: syncthing: split into l and krebs

---
 lass/2configs/syncthing.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'lass/2configs/syncthing.nix')

diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix
index 50f28264..e288df68 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 = [
-- 
cgit v1.2.3