diff options
| author | tv <tv@shackspace.de> | 2015-08-29 00:19:52 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-08-29 00:20:58 +0200 |
| commit | 09257f97823e9a57cda749c2d5a69b18ef484cec (patch) | |
| tree | a92544b66b1784a05118a7dad4076f3b4013de23 /tv/1systems | |
| parent | 81eaf7a9e7b083c169828590d0d848cf933b32e0 (diff) | |
tv: use only pkgs
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/cd.nix | 6 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 8d6ac957a..0049387be 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -2,10 +2,6 @@ with lib; -let - tvpkgs = import ../5pkgs { inherit lib pkgs; }; -in - { krebs.build.host = config.krebs.hosts.cd; krebs.build.user = config.krebs.users.tv; @@ -136,7 +132,7 @@ in server-names = singleton "viljetic.de"; # TODO directly set root (instead via location) locations = singleton (nameValuePair "/" '' - root ${tvpkgs.viljetic-pages}; + root ${pkgs.viljetic-pages}; ''); }; } diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 34ba5651e..622fd721a 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -2,10 +2,6 @@ with lib; -let - tvpkgs = import ../5pkgs { inherit lib pkgs; }; -in - { krebs.build.host = config.krebs.hosts.wu; krebs.build.user = config.krebs.users.tv; @@ -39,12 +35,12 @@ in environment.systemPackages = with pkgs; [ # stockholm + genid git gnumake + hashPassword + lentil parallel - tvpkgs.genid - tvpkgs.hashPassword - tvpkgs.lentil (pkgs.writeScriptBin "ff" '' #! ${pkgs.bash}/bin/bash exec sudo -u ff -i <<EOF @@ -72,6 +68,8 @@ in # tv bc bind # dig + cac + dic file gitAndTools.qgit gnupg21 @@ -84,6 +82,7 @@ in netcat nix-repl nmap + nq p7zip pavucontrol posix_man_pages @@ -91,9 +90,6 @@ in sxiv texLive tmux - tvpkgs.cac - tvpkgs.dic - tvpkgs.nq zathura #ack |