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 | 3c093a2196c7da4d455cc1c2320891260cd99883 (patch) | |
tree | b6b1a4438c0ed9dcfa988191d2df7e2eba13e725 /tv/1systems | |
parent | 97e83d366005ba84100a72418aaa659b48d4daaf (diff) | |
parent | cc5d5eabdc56bc3f15a79c78d8a4674e7b604529 (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 26a603e..ee529f3 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 d9aec40..20e0e96 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 |