diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-28 22:00:25 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-28 22:00:25 +0200 |
| commit | dfd1b5f6bc278be615975dc619e1f9490e05ef7a (patch) | |
| tree | 2991cddc8933d494a8b13124bf59540fe0124c9c /krebs/3modules | |
| parent | 6919ec53cc640e0b813989012eecc58665887e19 (diff) | |
| parent | 32d8c202b0ec037dcf78ebf6ecad730cfb9c5272 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/ci.nix | 8 | ||||
| -rw-r--r-- | krebs/3modules/fetchWallpaper.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 542a9252f..6e4db6edd 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -116,8 +116,12 @@ in "dummy_secrets": "true", }, command=[ - "nix-shell", "--run", - "test --user={} --system={} --target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user, host, user) + "nix-shell", "--run", " ".join(["test", + "--user={}".format(user), + "--system={}".format(host), + "--force-populate", + "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user), + ]) ] ) diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix index cdb9fe70a..8d4933cb5 100644 --- a/krebs/3modules/fetchWallpaper.nix +++ b/krebs/3modules/fetchWallpaper.nix @@ -51,7 +51,7 @@ let mkdir -p ${cfg.stateDir} chmod o+rx ${cfg.stateDir} cd ${cfg.stateDir} - (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || : + (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper.tmp ${shell.escape cfg.url} && cp wallpaper.tmp wallpaper) || : feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper ''; diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index c554391f2..f0722e9ba 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -97,7 +97,6 @@ with import <stockholm/lib>; aliases = [ "prism.r" "build.prism.r" - "cgit.prism.r" "cache.prism.r" "paste.r" "p.r" @@ -255,7 +254,7 @@ with import <stockholm/lib>; nets = rec { retiolum = { ip4.addr = "10.243.133.114"; - ip6.addr = "42:0:0:0:0:0:1ca0:1205"; + ip6.addr = "42:0:0:0:0:0:01ca:1205"; aliases = [ "icarus.r" "cgit.icarus.r" |