diff options
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 6 | ||||
| -rw-r--r-- | shell.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/bash/default.nix | 10 | ||||
| -rw-r--r-- | tv/source.nix | 6 |
4 files changed, 17 insertions, 8 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 6c2a92c08..86e7880db 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -80,6 +80,9 @@ in { ] ) + for i in [ "test-all-krebs-modules", "test-centos7", "test-minimal-deploy", "wolf" ]: + build_host("krebs", i) + for i in [ "mors", "uriel", "shodan", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]: build_host("lass", i) @@ -89,9 +92,6 @@ in { for i in [ "hiawatha", "onondaga" ]: build_host("nin", i) - for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]: - build_host("shared", i) - for i in [ "alnus", "mu", "nomic", "wu", "xu", "zu" ]: build_host("tv", i) @@ -19,12 +19,13 @@ let cmds.test = pkgs.writeDash "cmds.test" /* sh */ '' set -efu + export dummy_secrets=true + command=test . ${init.args} \test -n "''${user-}" || user=$LOGNAME . ${init.env} - export dummy_secrets=true exec ${utils.build} config.system.build.toplevel ''; 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 |