From 4f58b884dda57db8106768a22a206d6605d6e3e5 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 2 Jun 2017 03:58:13 +0200 Subject: [PATCH 1/4] krebsco.de MX: cd -> ni --- krebs/3modules/tv/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 0db686005..6e5f522dc 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -77,9 +77,7 @@ with import ; extraZones = { # TODO generate krebsco.de zone from nets and don't use extraZones at all "krebsco.de" = '' - krebsco.de. 60 IN MX 5 mx23 cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} - mx23 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} ''; }; nets = { @@ -212,6 +210,7 @@ with import ; ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + krebsco.de. 60 IN MX 5 ni ''; }; nets = { From c68fe5f5b59bb598f5b4443f821586c7bb316ba1 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 4 Jun 2017 08:56:32 +0200 Subject: [PATCH 2/4] tv/xu krebszones: add sane defaults --- tv/1systems/xu.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 60d1af23e..288373fc9 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -46,6 +46,18 @@ with import ; texlive.combined.scheme-full tmux + (pkgs.writeDashBin "krebszones" '' + set -efu + export OVH_ZONE_CONFIG=$HOME/.secrets/krebs/ovh-zone.conf + case $* in + import) + set -- import /etc/zones/krebsco.de krebsco.de + echo "+ krebszones $*" >&2 + ;; + esac + exec ${pkgs.krebszones}/bin/ovh-zone "$@" + '') + #ack #apache-httpd #ascii From 99a5c110ac4f5056db66f5d229496508ec85dacd Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 4 Jun 2017 09:07:59 +0200 Subject: [PATCH 3/4] tv gitconfig: init --- tv/1systems/nomic.nix | 2 +- tv/1systems/wu.nix | 2 +- tv/1systems/xu.nix | 2 +- tv/1systems/zu.nix | 2 +- tv/2configs/gitconfig.nix | 19 +++++++++++++++++++ tv/2configs/{git.nix => gitrepos.nix} | 0 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 tv/2configs/gitconfig.nix rename tv/2configs/{git.nix => gitrepos.nix} (100%) diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 5469fffd5..9b9502254 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -9,7 +9,7 @@ with import ; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/im.nix ../2configs/mail-client.nix ../2configs/nginx/public_html.nix diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 328e71fdc..60f9fa100 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -9,7 +9,7 @@ with import ; ../. ../2configs/hw/w110er.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/im.nix ../2configs/mail-client.nix ../2configs/man.nix diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 288373fc9..0a15ba838 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -9,7 +9,7 @@ with import ; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/mail-client.nix ../2configs/man.nix ../2configs/nginx/public_html.nix diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix index b1b2d58ce..5552ef065 100644 --- a/tv/1systems/zu.nix +++ b/tv/1systems/zu.nix @@ -15,7 +15,7 @@ with import ; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/mail-client.nix ../2configs/man.nix ../2configs/nginx/public_html.nix diff --git a/tv/2configs/gitconfig.nix b/tv/2configs/gitconfig.nix new file mode 100644 index 000000000..771a4b2a4 --- /dev/null +++ b/tv/2configs/gitconfig.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: + +with import ; + +{ + environment.etc.gitconfig.text = '' + [alias] + patch = !${pkgs.git}/bin/git --no-pager diff --no-color + [diff-so-fancy] + markEmptyLines = false + stripLeadingSymbols = false + [pager] + diff = ${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy \ + | ${pkgs.less}/bin/less -FRX + [user] + email = tv@krebsco.de + name = tv + ''; +} diff --git a/tv/2configs/git.nix b/tv/2configs/gitrepos.nix similarity index 100% rename from tv/2configs/git.nix rename to tv/2configs/gitrepos.nix From d18eb5ccd1ec6cc0b7797ac72d8bb258689a544b Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 4 Jun 2017 09:18:43 +0200 Subject: [PATCH 4/4] xu: add gitconfig --- tv/1systems/xu.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 0a15ba838..bfd59531a 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -9,6 +9,7 @@ with import ; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix + ../2configs/gitconfig.nix ../2configs/gitrepos.nix ../2configs/mail-client.nix ../2configs/man.nix