From 60cc5637365af3fcfb4fdb0eed36d26beea7a697 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Aug 2015 21:31:59 +0200 Subject: krebs += pkgs.writeC lib.toC --- tv/1systems/wu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/1systems') diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index e48da90..6131897 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -3,7 +3,7 @@ with lib; let - tvpkgs = import ../5pkgs { inherit pkgs; }; + tvpkgs = import ../5pkgs { inherit lib pkgs; }; in { -- cgit v1.2.3 From 41ab71cb129c170608778d8acd3de1478d252800 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Aug 2015 21:48:29 +0200 Subject: tv configs test: init --- tv/1systems/wu.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/1systems') diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 6131897..34ba565 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -33,6 +33,7 @@ in ../2configs/mail-client.nix ../2configs/xserver.nix ../2configs/synaptics.nix # TODO w110er if xserver is enabled + ../2configs/test.nix ../2configs/urlwatch.nix { environment.systemPackages = with pkgs; [ -- cgit v1.2.3 From b9ba0d66d1b34831eba134bc27f13099fd184795 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Aug 2015 22:27:23 +0200 Subject: {tv,krebs}: import krebs pkgs with lib --- tv/1systems/cd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/1systems') diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 9f412d9..8d6ac95 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -3,7 +3,7 @@ with lib; let - tvpkgs = import ../5pkgs { inherit pkgs; }; + tvpkgs = import ../5pkgs { inherit lib pkgs; }; in { -- cgit v1.2.3 From ff4283704f16b2f708ab9a0063063149379e0f5e Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Aug 2015 00:19:52 +0200 Subject: tv: use only pkgs --- tv/1systems/cd.nix | 6 +----- tv/1systems/wu.nix | 16 ++++++---------- 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'tv/1systems') diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 8d6ac95..0049387 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 34ba565..622fd72 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 < Date: Sat, 29 Aug 2015 00:58:41 +0200 Subject: Z* -> */Z* --- tv/1systems/cd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/1systems') diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 0049387..03c375b 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -31,7 +31,7 @@ with lib; imports = [ ../2configs/charybdis.nix ]; tv.charybdis = { enable = true; - sslCert = ../../Zcerts/charybdis_cd.crt.pem; + sslCert = ../Zcerts/charybdis_cd.crt.pem; }; } { -- cgit v1.2.3 From 30360c5894ee4779ff9ef0a90bf74a4ec3e4c246 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Aug 2015 08:30:16 +0200 Subject: tv wu systemPackages += pssh --- tv/1systems/wu.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/1systems') diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 622fd72..da60738 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -86,6 +86,7 @@ with lib; p7zip pavucontrol posix_man_pages + pssh qrencode sxiv texLive -- cgit v1.2.3 From 6400afbbb4053848cc914e388d0b352768fef43e Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Aug 2015 08:57:53 +0200 Subject: tv {cd,nomic} += ntp --- tv/1systems/cd.nix | 1 + tv/1systems/nomic.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'tv/1systems') diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 03c375b..bb81245 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -167,6 +167,7 @@ with lib; iptables mutt # for mv nethogs + ntp # ntpate rxvt_unicode.terminfo tcpdump ]; diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 028e535..7010e68 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -112,6 +112,7 @@ with lib; exit 23 esac '') + ntp # ntpate rxvt_unicode.terminfo tmux ]; -- cgit v1.2.3 From d1bb3d552550c81f73495adc00a847ad65641eb0 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Aug 2015 09:02:00 +0200 Subject: tv {cd,nomic,wu}: disable consul --- tv/1systems/cd.nix | 2 +- tv/1systems/nomic.nix | 2 +- tv/1systems/wu.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tv/1systems') diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index bb81245..b385848 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -25,7 +25,7 @@ with lib; ../2configs/CAC-Developer-2.nix ../2configs/CAC-CentOS-7-64bit.nix ../2configs/base.nix - ../2configs/consul-server.nix + #../2configs/consul-server.nix ../2configs/git.nix { imports = [ ../2configs/charybdis.nix ]; diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 7010e68..f08e74b 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -24,7 +24,7 @@ with lib; imports = [ ../2configs/AO753.nix ../2configs/base.nix - ../2configs/consul-server.nix + #../2configs/consul-server.nix ../2configs/git.nix { tv.iptables = { diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index da60738..6cd1565 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -24,7 +24,7 @@ with lib; imports = [ ../2configs/w110er.nix ../2configs/base.nix - ../2configs/consul-client.nix + #../2configs/consul-client.nix ../2configs/git.nix ../2configs/mail-client.nix ../2configs/xserver.nix -- cgit v1.2.3