summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-30 18:31:11 +0200
committerlassulus <lass@lassul.us>2017-04-30 18:31:11 +0200
commitc5b1857384e220b9c12f9976e33b0c93c195a90e (patch)
tree9dd1ff1efee7c61b5772f04e4d49f67a7f5c4dc5 /tv
parent22f019bada5fe9b688b343093a8da15be8787315 (diff)
parentca2c22601fcfc0e618bb3cc73fb6c67ac03087ea (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/2configs/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 8cf6146b5..60d1af23e 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -43,7 +43,7 @@ with import <stockholm/lib>;
pass
q
qrencode
- #texLive
+ texlive.combined.scheme-full
tmux
#ack
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index fd8bafe05..d16ff4eb5 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 = "67c6638b089a5766435e07057ff73b35c82440cc"; # nixos-17.03
+ ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";