diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-14 01:51:36 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-14 01:51:36 +0100 |
| commit | 773a67a983cbe1928da6c524db24a25229a6f5fe (patch) | |
| tree | 2a00ed5a39f85b837578625cf49d193f4d308f14 /lass/2configs/base.nix | |
| parent | a0fbe917ac45cda4de0f16bced3ce3ebfc556fe8 (diff) | |
| parent | e7d22252dcad25fd5594e9a431f5a39aa620906d (diff) | |
Merge remote-tracking branch 'cloudkrebs/master' into pre-merge
Diffstat (limited to 'lass/2configs/base.nix')
| -rw-r--r-- | lass/2configs/base.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 11bc4f089..61023057b 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -48,7 +48,7 @@ with lib; source = { git.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80"; + rev = "8d1ce129361312334bf914ce0d27e463cb0bb21b"; }; dir.secrets = { host = config.krebs.hosts.mors; @@ -92,6 +92,10 @@ with lib; most rxvt_unicode.terminfo + #monitoring tools + htop + iotop + #network iptables |