Merge remote-tracking branch 'ni/master'

7 files changed, 37 insertions, 6 deletions

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 0db68600..6e5f522d 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -77,9 +77,7 @@ with import <stockholm/lib>;
       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 <stockholm/lib>;
           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 = {
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 5469fffd..9b950225 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
     ../.
     ../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 328e71fd..60f9fa10 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
     ../.
     ../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 60d1af23..bfd59531 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -9,7 +9,8 @@ with import <stockholm/lib>;
     ../.
     ../2configs/hw/x220.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/git.nix
+    ../2configs/gitconfig.nix
+    ../2configs/gitrepos.nix
     ../2configs/mail-client.nix
     ../2configs/man.nix
     ../2configs/nginx/public_html.nix
@@ -46,6 +47,18 @@ with import <stockholm/lib>;
         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
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index b1b2d58c..5552ef06 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -15,7 +15,7 @@ with import <stockholm/lib>;
     ../.
     ../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 00000000..771a4b2a
--- /dev/null
+++ b/tv/2configs/gitconfig.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+with import <stockholm/lib>;
+
+{
+  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
index 13b12986..13b12986 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/gitrepos.nix