diff options
| author | makefu <github@syntax-fehler.de> | 2017-05-09 23:17:30 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-05-09 23:17:30 +0200 |
| commit | fb1fff243a100757391552f7caa691bd9fe36097 (patch) | |
| tree | 48d87558a609b9f45d43a37aa27bb04293b32689 /lass/1systems | |
| parent | 991687f7428440356403b6c63d695397b33078a6 (diff) | |
| parent | 689399546d38b6dc5a643cc2efad9c1d0ae76058 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/helios.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/iso.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/prism.nix | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix index 298c9083d..99760dfdb 100644 --- a/lass/1systems/helios.nix +++ b/lass/1systems/helios.nix @@ -48,6 +48,7 @@ with import <stockholm/lib>; maven arandr libreoffice + mpv ]; } #{ diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 99399550c..30fc674bc 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -7,7 +7,6 @@ with import <stockholm/lib>; ../../krebs ../3modules ../5pkgs - ../2configs/binary-cache/client.nix ../2configs/mc.nix ../2configs/nixpkgs.nix ../2configs/vim.nix diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index c897ab655..01cfe5414 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -256,7 +256,7 @@ in { { krebs.Reaktor.coders = { nickname = "Reaktor|lass"; - channels = [ "#coders" ]; + channels = [ "#coders" "#germany" ]; extraEnviron = { REAKTOR_HOST = "irc.hackint.org"; }; |