diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-14 14:09:45 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-14 14:09:45 +0200 |
| commit | 3698f2a40c2db7df0888974c9b2e347947088a98 (patch) | |
| tree | 64c7d8ecddb6acf503b5335a4058fd2018734559 /tv | |
| parent | 11db8fb3294a3d0cdef9160834f855d9c648ef01 (diff) | |
| parent | c113f235ccfe62c992bf28692b999020c92ef275 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/bash/default.nix | 10 | ||||
| -rw-r--r-- | tv/source.nix | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix index 40c0725ed..546b2e7b7 100644 --- a/tv/2configs/bash/default.nix +++ b/tv/2configs/bash/default.nix @@ -4,7 +4,7 @@ with import <stockholm/lib>; { programs.bash = { - interactiveShellInit = '' + interactiveShellInit = /* sh */ '' HISTCONTROL='erasedups:ignorespace' HISTSIZE=65536 HISTFILESIZE=$HISTSIZE @@ -14,7 +14,7 @@ with import <stockholm/lib>; shopt -s no_empty_cmd_completion complete -d cd ''; - promptInit = '' + promptInit = /* sh */ '' case $UID in 0) PS1='\[\e[1;31m\]\w\[\e[0m\] ' @@ -32,6 +32,12 @@ with import <stockholm/lib>; if test -n "$SSH_AGENT_PID"; then PS1="ssh-agent[$SSH_AGENT_PID] $PS1" fi + + case ''${XMONAD_SPAWN_WORKSPACE-} in + stockholm) + cd ~/stockholm + ;; + esac ''; }; } diff --git a/tv/source.nix b/tv/source.nix index dcfdb7552..18733ee5c 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -17,10 +17,12 @@ in buildbot = toString <stockholm/tv/dummy_secrets>; tv = "/home/tv/secrets/${name}"; }; - secrets-common.file = "/home/tv/secrets/common"; stockholm.file = toString <stockholm>; } - (mkIf secure { + (mkIf (builder == "tv") { + secrets-common.file = "/home/tv/secrets/common"; + }) + (mkIf (builder == "tv" && secure) { secrets-master.file = "/home/tv/secrets/master"; }) override |