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

---
 tv/2configs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tv/2configs')

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
       ];
     }
-- 
cgit v1.2.3


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

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

(limited to 'tv/2configs')

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
-- 
cgit v1.2.3


From 22daf39ce8a48d960019ca11bf1616883a104373 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 14 Mar 2017 23:15:23 +0100
Subject: tv: add krebspaste

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

(limited to 'tv/2configs')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4c10b2a28..d17e41351 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -154,6 +154,7 @@ with import <stockholm/lib>;
     {
       environment.systemPackages = [
         pkgs.get
+        pkgs.krebspaste
         pkgs.krebszones
         pkgs.nix-prefetch-scripts
         pkgs.push
-- 
cgit v1.2.3


From 75040367ffe94c6c19973ccc1dd5efe24afac78d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 15 Mar 2017 02:10:31 +0100
Subject: tv vim: use concat

---
 tv/2configs/vim.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'tv/2configs')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 1ffafe9c9..8b83b0503 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -297,14 +297,18 @@ let {
     alldirs = attrValues dirs ++ map dirOf (attrValues files);
   in unique (sort lessThan alldirs);
 
-  vim = pkgs.writeDashBin "vim" ''
-    set -efu
-    (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
-    if test $# = 0 && test -e "$PWD/.ctrlpignore"; then
-      set -- +CtrlP
-    fi
-    exec ${pkgs.vim}/bin/vim "$@"
-  '';
+  vim = pkgs.concat "vim" [
+    pkgs.vim_configurable
+    (pkgs.writeDashBin "vim" ''
+      set -efu
+      (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
+      if test $# = 0 && test -e "$PWD/.ctrlpignore"; then
+        set -- +CtrlP
+      fi
+      # vim-orgmode needs Python, thus vim_configurable instead of just vim
+      exec ${pkgs.vim_configurable}/bin/vim "$@"
+    '')
+  ];
 
   vimrc = pkgs.writeText "vimrc" ''
     set nocompatible
-- 
cgit v1.2.3