diff options
| -rw-r--r-- | tv/1systems/cd.nix | 6 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 16 | ||||
| -rw-r--r-- | tv/2configs/charybdis.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/mail-client.nix | 5 | ||||
| -rw-r--r-- | tv/2configs/test.nix | 6 | ||||
| -rw-r--r-- | tv/5pkgs/default.nix | 5 |
6 files changed, 14 insertions, 30 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 diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix index 6be6c02c6..a949026de 100644 --- a/tv/2configs/charybdis.nix +++ b/tv/2configs/charybdis.nix @@ -1,9 +1,5 @@ { config, lib, pkgs, ... }: -let - tvpkgs = import ../5pkgs { inherit lib pkgs; }; -in - with builtins; with lib; let @@ -63,7 +59,7 @@ let ExecStart = pkgs.writeScript "charybdis-service" '' #! /bin/sh set -euf - exec ${tvpkgs.charybdis}/bin/charybdis-ircd \ + exec ${pkgs.charybdis}/bin/charybdis-ircd \ -foreground \ -logfile /dev/stderr \ -configfile ${configFile} diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix index 1daacdb4c..8b6f8bbcd 100644 --- a/tv/2configs/mail-client.nix +++ b/tv/2configs/mail-client.nix @@ -1,7 +1,6 @@ -{ lib, pkgs, ... }: - -with import ../5pkgs { inherit lib pkgs; }; +{ pkgs, ... }: +with pkgs; { environment.systemPackages = [ much diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix index fa556ec78..409b4e9b4 100644 --- a/tv/2configs/test.nix +++ b/tv/2configs/test.nix @@ -3,8 +3,6 @@ with import ../4lib { inherit lib pkgs; }; let - tvpkgs = import ../5pkgs { inherit lib pkgs; }; - out = { environment.systemPackages = [ su-test @@ -17,12 +15,12 @@ let }; }; - su-test = tvpkgs.execveBin "su-test" rec { + su-test = pkgs.execveBin "su-test" rec { filename = "/var/setuid-wrappers/sudo"; argv = ["sudo" "-u" "test" "-i"]; }; - test-shell = tvpkgs.execve "test-shell" rec { + test-shell = pkgs.execve "test-shell" rec { filename = "${pkgs.bash}/bin/bash"; argv = ["sh" "--noprofile" "-l"]; envp.ENV = pkgs.writeText "test-env" '' diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index a0a22df9f..ce137d961 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,11 +1,10 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: let inherit (pkgs) callPackage; - kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; }; in -kpkgs // { +{ charybdis = callPackage ./charybdis {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; |