summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-02-01 13:54:09 +0100
committermakefu <github@syntax-fehler.de>2022-02-01 13:54:09 +0100
commitc564c4f0f48e6d6e889f50b520b7c512df527660 (patch)
tree540a8ed795596c2de673f1fb4326dd89a003c1a4 /lass
parent965a6c96c3b7216bf8ca1b985f8bece6c73213c4 (diff)
parentbe042e3446905e2517b530403bacc63b6de49d34 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/retiolum.nix3
-rw-r--r--lass/2configs/sync/the_playlist.nix8
2 files changed, 4 insertions, 7 deletions
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index a305d3e18..d4d97a889 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -28,9 +28,6 @@
'';
};
- # never connect via gum (he eats our packets!)
- krebs.hosts.gum.nets.retiolum.tinc.weight = 9000;
-
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
};
diff --git a/lass/2configs/sync/the_playlist.nix b/lass/2configs/sync/the_playlist.nix
index 5bbf790a7..c01a11cc3 100644
--- a/lass/2configs/sync/the_playlist.nix
+++ b/lass/2configs/sync/the_playlist.nix
@@ -1,9 +1,9 @@
{
services.syncthing.folders.the_playlist = {
path = "/home/lass/tmp/the_playlist";
- devices = [ "mors" "phone" "prism" ];
+ devices = [ "mors" "phone" "prism" "omo" ];
};
- lass.acl."/home/lass/tmp/the_playlist"."u:syncthing:X".parents = true;
- lass.acl."/home/lass/tmp/the_playlist"."u:syncthing:rwX" = {};
- lass.acl."/home/lass/tmp/the_playlist"."u:lass:rwX" = {};
+ krebs.acl."/home/lass/tmp/the_playlist"."u:syncthing:X".parents = true;
+ krebs.acl."/home/lass/tmp/the_playlist"."u:syncthing:rwX" = {};
+ krebs.acl."/home/lass/tmp/the_playlist"."u:lass:rwX" = {};
}