diff options
author | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
commit | 23385c2984c9d4fbff65c920d9d59bc29314a639 (patch) | |
tree | d7e4f635be78922359b21970f6a6c8731995e38d /tv | |
parent | de43b0e6f50e4d044cc0609a3d7d7c7d869552fe (diff) | |
parent | 2dd4dbbf6ea77972c7d5edb0ec25b8e778bfeb50 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/nomic.nix | 3 | ||||
-rw-r--r-- | tv/1systems/xu.nix | 3 | ||||
-rw-r--r-- | tv/2configs/pulse.nix | 3 | ||||
-rw-r--r-- | tv/5pkgs/default.nix | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index fed67a10..3696bcdf 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -47,8 +47,7 @@ with config.krebs.lib; boot.tmpOnTmpfs = true; environment.systemPackages = with pkgs; [ - (writeScriptBin "play" '' - #! /bin/sh + (writeDashBin "play" '' set -euf mpv() { exec ${mpv}/bin/mpv "$@"; } case $1 in diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index a79ae498..6ba7ab32 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -26,8 +26,7 @@ with config.krebs.lib; hashPassword haskellPackages.lentil parallel - (pkgs.writeScriptBin "im" '' - #! ${pkgs.bash}/bin/bash + (pkgs.writeBashBin "im" '' export PATH=${makeSearchPath "bin" (with pkgs; [ tmux gnugrep diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index 8e611f21..51291975 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -67,8 +67,7 @@ in }; serviceConfig = { ExecStart = "${pkg}/bin/pulseaudio"; - ExecStartPre = pkgs.writeScript "pulse-start" '' - #! /bin/sh + ExecStartPre = pkgs.writeDash "pulse-start" '' install -o pulse -g pulse -m 0750 -d ${runDir} install -o pulse -g pulse -m 0700 -d ${runDir}/home ''; diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index da3c914b..60798080 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -3,8 +3,7 @@ { nixpkgs.config.packageOverrides = { # TODO use XDG_RUNTIME_DIR? - cr = pkgs.writeScriptBin "cr" '' - #! /bin/sh + cr = pkgs.writeDashBin "cr" '' set -efu export LC_TIME=de_DE.utf8 exec ${pkgs.chromium}/bin/chromium \ |