summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-10-15 15:18:29 +0200
committerlassulus <lass@aidsballs.de>2015-10-15 15:18:29 +0200
commitba5479b4cda8bc70fc67e6e0d90d90aa7a7b9dab (patch)
treeee5b8c780ab6dfd7c0c8b51346a9173d98613fe5 /tv
parenta8816bcfe351c1fe9e1a00b27707b56eb544d390 (diff)
parent338df3310352163d3cce850e6ff461c2cdf58eb5 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/wu.nix1
-rw-r--r--tv/2configs/base.nix6
-rw-r--r--tv/2configs/git.nix1
3 files changed, 3 insertions, 5 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 0ef846f93..cc99b0498 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -89,6 +89,7 @@ with lib;
pavucontrol
posix_man_pages
pssh
+ push
qrencode
sxiv
texLive
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index 1c6eba662..010d4b326 100644
--- a/tv/2configs/base.nix
+++ b/tv/2configs/base.nix
@@ -79,11 +79,7 @@ in
environment.etc."vim/vim${majmin pkgs.vim.version}".source =
"${pkgs.vim}/share/vim/vim${majmin pkgs.vim.version}";
- # multiple-definition-problem when defining environment.variables.EDITOR
- environment.extraInit = ''
- EDITOR=vim
- '';
-
+ environment.variables.EDITOR = mkForce "vim";
environment.variables.VIM = "/etc/vim";
}
{
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 401cf5f4d..d782c87f1 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -35,6 +35,7 @@ let
nixos-infest = {};
nixpkgs = {};
painload = {};
+ push = {};
quipper = {};
regfish = {};
stockholm = {