summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2015-11-07 19:22:54 +0100
committertv <tv@krebsco.de>2015-11-07 19:22:54 +0100
commitb6e616bb134019ef46919218b79d45af0cdb3d08 (patch)
treee1176af1d38c23284e9c53ec5cf56f10316d9bd0 /tv
parente57ce8bc98ba3d90b0044d90f4bff10475354fd1 (diff)
parenta3f6dcb75ce73f57e1053054cf70667c2daef22d (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/wu.nix7
-rw-r--r--tv/1systems/xu.nix8
-rw-r--r--tv/2configs/xserver/default.nix6
3 files changed, 7 insertions, 14 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 26a603e9b..ee529f3dc 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -44,31 +44,24 @@ with lib;
bind # dig
cac
dic
- ff
file
get
- gitAndTools.qgit
gnupg21
haskellPackages.hledger
htop
jq
manpages
mkpasswd
- mpv
netcat
nix-repl
nmap
nq
p7zip
- pavucontrol
posix_man_pages
- pssh
push
qrencode
- sxiv
texLive
tmux
- zathura
#ack
#apache-httpd
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index d9aec4070..20e0e9681 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -47,29 +47,23 @@ with lib;
bind # dig
#cac
dic
- ff
file
- gitAndTools.qgit #xserver
gnupg21
haskellPackages.hledger
htop
jq
manpages
mkpasswd
- mpv #xserver
netcat
nix-repl
nmap
nq
p7zip
- pavucontrol #xserver
+ pass
posix_man_pages
- #pssh
qrencode
- sxiv #xserver
texLive
tmux
- zathura #xserver
#ack
#apache-httpd
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index df00203be..7a48db6b8 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -34,7 +34,13 @@ let
};
environment.systemPackages = [
+ pkgs.ff
+ pkgs.gitAndTools.qgit
+ pkgs.mpv
+ pkgs.pavucontrol
pkgs.slock
+ pkgs.sxiv
+ pkgs.zathura
];
security.setuidPrograms = [