diff options
| author | jeschli <jeschli@gmail.com> | 2018-01-21 10:40:42 +0000 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-01-21 10:40:42 +0000 |
| commit | 7d0c94e36a0e1a90d4fc69de23467b67b01c9bdd (patch) | |
| tree | 201c9c95b54f59c1434e8afa2df0eeb2d9b780c2 /lass | |
| parent | baf4fc520b9faae6ad07c1b9f6d6623b92768ce6 (diff) | |
| parent | 3bd62207d4b60db4ca5f89bb84dc842b62bdfbaf (diff) | |
Merge branch 'master' of prism.i:stockholm
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/mors/config.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/baseX.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/radio.nix | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index c231a0b10..936666a73 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -192,7 +192,7 @@ with import <stockholm/lib>; ''; }; - #nix.package = pkgs.nixUnstable; + nix.package = pkgs.nixUnstable; programs.adb.enable = true; users.users.mainUser.extraGroups = [ "adbusers" ]; } diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 5cb7eb03f..5ca024574 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -53,6 +53,7 @@ in { time.timeZone = "Europe/Berlin"; + programs.ssh.agentTimeout = "10m"; programs.ssh.startAgent = true; services.openssh.forwardX11 = true; diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix index 7f531bf3a..a83d51f1d 100644 --- a/lass/2configs/radio.nix +++ b/lass/2configs/radio.nix @@ -118,6 +118,7 @@ in { if test $(timeLeft) -le $LIMIT; then ${add_random}/bin/add_random fi + ${pkgs.mpc_cli}/bin/mpc play > /dev/null ''; in { description = "radio playlist autoadder"; |