From 490cee4a2f941efa5a45c0ba87daa5cc35636cc3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 7 Mar 2017 23:18:49 +0100
Subject: [PATCH 1/3] xu,zu: drop redundant "im"

---
 tv/1systems/xu.nix | 12 ------------
 tv/1systems/zu.nix | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 4b8fe8da2..2bab0f4b0 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -25,18 +25,6 @@ with import <stockholm/lib>;
         hashPassword
         #haskellPackages.lentil
         parallel
-        (pkgs.writeBashBin "im" ''
-          export PATH=${makeSearchPath "bin" (with pkgs; [
-            tmux
-            gnugrep
-            weechat
-          ])}
-          if tmux list-sessions -F\#S | grep -q '^im''$'; then
-            exec tmux attach -t im
-          else
-            exec tmux new -s im weechat
-          fi
-        '')
 
         # root
         cryptsetup
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index 194ac2928..cabe7f6a5 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -30,18 +30,6 @@ with import <stockholm/lib>;
         hashPassword
         haskellPackages.lentil
         parallel
-        (pkgs.writeBashBin "im" ''
-          export PATH=${makeSearchPath "bin" (with pkgs; [
-            tmux
-            gnugrep
-            weechat
-          ])}
-          if tmux list-sessions -F\#S | grep -q '^im''$'; then
-            exec tmux attach -t im
-          else
-            exec tmux new -s im weechat
-          fi
-        '')
 
         # root
         cryptsetup

From c432c6646159569088452cc4caea1d3820ebe0f7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 7 Mar 2017 23:24:31 +0100
Subject: [PATCH 2/3] tv: stockholm dependencies are default

---
 tv/1systems/wu.nix      | 6 ------
 tv/1systems/xu.nix      | 5 -----
 tv/1systems/zu.nix      | 6 ------
 tv/2configs/default.nix | 2 ++
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 4cde8b903..328e71fdc 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -19,12 +19,6 @@ with import <stockholm/lib>;
     ../2configs/xserver
     {
       environment.systemPackages = with pkgs; [
-
-        # stockholm
-        gnumake
-        hashPassword
-        parallel
-
         # root
         cryptsetup
 
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 2bab0f4b0..8cf6146b5 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -20,11 +20,6 @@ with import <stockholm/lib>;
     {
       environment.systemPackages = with pkgs; [
 
-        # stockholm
-        gnumake
-        hashPassword
-        #haskellPackages.lentil
-        parallel
 
         # root
         cryptsetup
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index cabe7f6a5..b1b2d58ce 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -25,12 +25,6 @@ with import <stockholm/lib>;
     {
       environment.systemPackages = with pkgs; [
 
-        # stockholm
-        gnumake
-        hashPassword
-        haskellPackages.lentil
-        parallel
-
         # root
         cryptsetup
 
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index e170156a4..4c10b2a28 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -38,6 +38,8 @@ with import <stockholm/lib>;
       # stockholm dependencies
       environment.systemPackages = with pkgs; [
         git
+        gnumake
+        hashPassword
         populate
       ];
     }

From e4225f826cfba6faf9c582c0e043dc58864a56a5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 9 Mar 2017 16:54:58 +0100
Subject: [PATCH 3/3] tv exim-smarthost: relay_from_hosts += ip6.addr

---
 tv/2configs/exim-smarthost.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index cc3bdf95d..816dce78d 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -13,7 +13,7 @@ with import <stockholm/lib>;
       "shackspace.de"
       "viljetic.de"
     ];
-    relay_from_hosts = map (host: host.nets.retiolum.ip4.addr) [
+    relay_from_hosts = concatMap (host: host.nets.retiolum.addrs) [
       config.krebs.hosts.nomic
       config.krebs.hosts.wu
       config.krebs.hosts.xu