Merge branch 'master' of prism.r:stockholm

2 files changed, 18 insertions, 3 deletions

diff --git a/lass/1systems/blue/source.nix b/lass/1systems/blue/source.nix
index 21f3a8bd5..1a98fc058 100644
--- a/lass/1systems/blue/source.nix
+++ b/lass/1systems/blue/source.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, test, ... }:
 {
-  nixpkgs = lib.mkForce {
+  nixpkgs = lib.mkIf (! test) (lib.mkForce {
     file = {
       path = toString (pkgs.fetchFromGitHub {
         owner = "nixos";
@@ -10,5 +10,5 @@
       });
       useChecksum = true;
     };
-  };
+  });
 }
diff --git a/lass/1systems/xerxes/config.nix b/lass/1systems/xerxes/config.nix
index b393f203d..c120c17d7 100644
--- a/lass/1systems/xerxes/config.nix
+++ b/lass/1systems/xerxes/config.nix
@@ -32,4 +32,19 @@
   ];
 
   lass.screenlock.enable = lib.mkForce false;
+  krebs.syncthing = {
+    folders = {
+      the_playlist = {
+        path = "/home/lass/tmp/the_playlist";
+        peers = [ "mors" "phone" "prism" "xerxes" ];
+      };
+    };
+  };
+  krebs.permown = {
+    "/home/lass/tmp/the_playlist" = {
+      owner = "lass";
+      group = "syncthing";
+      umask = "0007";
+    };
+  };
 }