diff options
| author | tv <tv@shackspace.de> | 2015-11-07 10:04:46 +0100 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-11-07 10:04:46 +0100 |
| commit | a3f6dcb75ce73f57e1053054cf70667c2daef22d (patch) | |
| tree | a1450fdda5e713b058b3180b3db4391e0187f624 /tv | |
| parent | 8ad05d0f40debdb2dc41aef2db24f77f539f4328 (diff) | |
tv: move X-based tools to xserver
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/wu.nix | 7 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 8 | ||||
| -rw-r--r-- | tv/2configs/xserver/default.nix | 6 |
3 files changed, 7 insertions, 14 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 26a603e9..ee529f3d 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 65220fe3..32688aae 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -44,29 +44,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 df00203b..7a48db6b 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 = [ |