diff options
author | tv <tv@krebsco.de> | 2015-11-07 10:04:46 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-11-07 10:04:46 +0100 |
commit | cc5d5eabdc56bc3f15a79c78d8a4674e7b604529 (patch) | |
tree | d3ac0536fd0d3a631d7ba8d09a784c1a25f29e83 /tv | |
parent | 3aaadcaacf699a8b1efeb35e27337c8881cba036 (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 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 65220fe..32688aa 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 df00203..7a48db6 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 = [ |