summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-31 10:47:29 +0200
committermakefu <github@syntax-fehler.de>2015-08-31 10:47:29 +0200
commit2eb8bcf9d1c293a8b28730c9a12d9a857c5a43a7 (patch)
treec8a1d55a148e59f51a400e0d5dc11780d4e4005c /tv/1systems
parent0acd7f23e1e3adf4bf1427f186a7bf5505ff910d (diff)
parent83f06535de527c7470f8ff9c8b5e3a4632cf7cb9 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/cd.nix11
-rw-r--r--tv/1systems/nomic.nix3
-rw-r--r--tv/1systems/wu.nix19
3 files changed, 15 insertions, 18 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 9f412d9b8..b385848f1 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -2,10 +2,6 @@
with lib;
-let
- tvpkgs = import ../5pkgs { inherit pkgs; };
-in
-
{
krebs.build.host = config.krebs.hosts.cd;
krebs.build.user = config.krebs.users.tv;
@@ -29,13 +25,13 @@ in
../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 ];
tv.charybdis = {
enable = true;
- sslCert = ../../Zcerts/charybdis_cd.crt.pem;
+ sslCert = ../Zcerts/charybdis_cd.crt.pem;
};
}
{
@@ -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};
'');
};
}
@@ -171,6 +167,7 @@ in
iptables
mutt # for mv
nethogs
+ ntp # ntpate
rxvt_unicode.terminfo
tcpdump
];
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 028e53539..f08e74bbe 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 = {
@@ -112,6 +112,7 @@ with lib;
exit 23
esac
'')
+ ntp # ntpate
rxvt_unicode.terminfo
tmux
];
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 2233b48d1..6cd1565f7 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -2,10 +2,6 @@
with lib;
-let
- tvpkgs = import ../5pkgs { inherit pkgs; };
-in
-
{
krebs.build.host = config.krebs.hosts.wu;
krebs.build.user = config.krebs.users.tv;
@@ -28,22 +24,23 @@ in
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
../2configs/synaptics.nix # TODO w110er if xserver is enabled
+ ../2configs/test.nix
../2configs/urlwatch.nix
{
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
@@ -71,6 +68,8 @@ in
# tv
bc
bind # dig
+ cac
+ dic
file
gitAndTools.qgit
gnupg21
@@ -83,15 +82,15 @@ in
netcat
nix-repl
nmap
+ nq
p7zip
pavucontrol
posix_man_pages
+ pssh
qrencode
sxiv
texLive
tmux
- tvpkgs.cac
- tvpkgs.dic
zathura
#ack