summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-11-15 11:20:34 +0100
committermakefu <github@syntax-fehler.de>2016-11-15 11:20:34 +0100
commit09018f17c3a348863ccce820e524eac2bfd78568 (patch)
tree933ce4a273e224f26b084f0090a74563cc9514e6 /tv
parentc281c4663d85e3d025216c9507ba96509c244c16 (diff)
parentbe75ad7e7c0771170ccaddfe99b7a64a9004bfcd (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/cd.nix1
-rw-r--r--tv/1systems/nomic.nix1
-rw-r--r--tv/2configs/default.nix2
3 files changed, 1 insertions, 3 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index dd8e2cc64..108006f34 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 793e1f80b..6669b5dcf 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 dbf311479..87727a865 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";