diff options
| author | tv <tv@krebsco.de> | 2015-11-07 19:22:54 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-11-07 19:22:54 +0100 |
| commit | b6e616bb134019ef46919218b79d45af0cdb3d08 (patch) | |
| tree | e1176af1d38c23284e9c53ec5cf56f10316d9bd0 /tv/1systems | |
| parent | e57ce8bc98ba3d90b0044d90f4bff10475354fd1 (diff) | |
| parent | a3f6dcb75ce73f57e1053054cf70667c2daef22d (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/wu.nix | 7 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 8 |
2 files changed, 1 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 |