diff options
| author | makefu <github@syntax-fehler.de> | 2016-11-15 11:20:34 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-11-15 11:20:34 +0100 |
| commit | aeb2db83deaded653c3b1be767892ebd265d7001 (patch) | |
| tree | 4363f68914d6401d101b92117714fcc6809021b7 | |
| parent | 595f246725fae403ac101919b96fda8731e3f18e (diff) | |
| parent | ab1b1881c51444badbe169ee00f532608caf3734 (diff) | |
Merge remote-tracking branch 'tv/master'
| -rw-r--r-- | tv/1systems/cd.nix | 1 | ||||
| -rw-r--r-- | tv/1systems/nomic.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index dd8e2cc..108006f 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -30,7 +30,6 @@ with import <stockholm/lib>; iotop iptables nethogs - rxvt_unicode.terminfo tcpdump ]; } diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 793e1f8..6669b5d 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -60,7 +60,6 @@ with import <stockholm/lib>; esac '') gnupg - rxvt_unicode.terminfo tmux ]; } diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index dbf3114..87727a8 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6"; + ref = "5ddaca179c15154efae4e5b7efea843d2c67cff8"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; |