Merge remote-tracking branch 'lass/master' into 22.05

3 files changed, 10 insertions, 18 deletions

diff --git a/lass/2configs/sync/decsync.nix b/lass/2configs/sync/decsync.nix
index a38cff8d6..5fded10a2 100644
--- a/lass/2configs/sync/decsync.nix
+++ b/lass/2configs/sync/decsync.nix
@@ -3,9 +3,8 @@
     path = "/home/lass/decsync";
     devices = [ "mors" "blue" "green" "phone" ];
   };
-  krebs.permown."/home/lass/decsync" = {
-    owner = "lass";
-    group = "syncthing";
-    umask = "0007";
-  };
+
+  krebs.acl."/home/lass/decsync"."u:syncthing:X".parents = true;
+  krebs.acl."/home/lass/decsync"."u:syncthing:rwX" = {};
+  krebs.acl."/home/lass/decsync"."u:lass:rwX" = {};
 }
diff --git a/lass/2configs/sync/sync.nix b/lass/2configs/sync/sync.nix
index a0927c199..2714fa83e 100644
--- a/lass/2configs/sync/sync.nix
+++ b/lass/2configs/sync/sync.nix
@@ -2,12 +2,7 @@
   services.syncthing.folders."/home/lass/sync" = {
     devices = [ "mors" "icarus" "xerxes" "shodan" "green" "blue" "coaxmetal" ];
   };
-  krebs.permown."/home/lass/sync" = {
-    file-mode = "u+rw,g+rw";
-    owner = "lass";
-    group = "syncthing";
-    umask = "0002";
-    keepGoing = true;
-  };
+  krebs.acl."/home/lass/sync"."u:syncthing:X".parents = true;
+  krebs.acl."/home/lass/sync"."u:syncthing:rwX" = {};
+  krebs.acl."/home/lass/sync"."u:lass:rwX" = {};
 }
-
diff --git a/lass/2configs/sync/weechat.nix b/lass/2configs/sync/weechat.nix
index eb6b0aa16..b32015b84 100644
--- a/lass/2configs/sync/weechat.nix
+++ b/lass/2configs/sync/weechat.nix
@@ -1,8 +1,6 @@
 {
   services.syncthing.folders."/home/lass/.weechat".devices = [ "green" "mors" ];
-  krebs.permown."/home/lass/.weechat" = {
-    owner = "lass";
-    group = "syncthing";
-    umask = "0007";
-  };
+  krebs.acl."/home/lass/.weechat"."u:syncthing:X".parents = true;
+  krebs.acl."/home/lass/.weechat"."u:syncthing:rwX" = {};
+  krebs.acl."/home/lass/.weechat"."u:lass:rwX" = {};
 }