summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-08-06 15:51:38 +0200
committerjeschli <jeschli@gmail.com>2019-08-06 15:51:38 +0200
commit01a431857a42a6a3fcbd6eff414071ca8ef15e74 (patch)
tree0eb84976b1850959233d758a7a27249498797b26 /lass
parentcd4f0290ed091cdae9b5d8526f4387b54e2c42dc (diff)
parent2885fbd942163d733586cd966c76ccf9159ae208 (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/blue/source.nix6
-rw-r--r--lass/1systems/xerxes/config.nix15
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";
+ };
+ };
}