summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-09-26 12:15:08 +0200
committerlassulus <lass@aidsballs.de>2015-09-26 12:15:08 +0200
commite97401da8a402698411b77e88b4a32d388c2ab6f (patch)
tree0194197f0b8fb097213e36e9e51c507ea7328ff0 /tv
parent5165f8e47fc6b0f18d1d0d38398362a03bae7531 (diff)
parent0727da625d4d1d30b85936499ada784b9f030a1c (diff)
Merge branch 'tv' into newmaster
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/wu.nix1
-rw-r--r--tv/2configs/git.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 6cd1565f7..36733ac41 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -71,6 +71,7 @@ with lib;
cac
dic
file
+ get
gitAndTools.qgit
gnupg21
haskellPackages.hledger
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 264cb4a1c..6624d62dc 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -26,6 +26,7 @@ let
cgserver = {};
crude-mail-setup = {};
dot-xmonad = {};
+ get = {};
hack = {};
load-env = {};
make-snapshot = {};