From 54517574ddb2f5ae10bba02f0b7f547bb53fc5bd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 11:15:58 +0100
Subject: [PATCH 01/59] tv rxvt_unicode: fetch patch

---
 tv/5pkgs/override/default.nix                 |  2 +-
 tv/5pkgs/override/rxvt_unicode.nix            |  9 ++++
 tv/5pkgs/override/rxvt_unicode/default.nix    |  6 ---
 .../finish-running-selection.patch            | 41 -------------------
 4 files changed, 10 insertions(+), 48 deletions(-)
 create mode 100644 tv/5pkgs/override/rxvt_unicode.nix
 delete mode 100644 tv/5pkgs/override/rxvt_unicode/default.nix
 delete mode 100644 tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch

diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index cd7c5645b..99c1b3ec9 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -1,6 +1,6 @@
 with import <stockholm/lib>;
 self: super: {
-  rxvt_unicode = self.callPackage ./rxvt_unicode {
+  rxvt_unicode = self.callPackage ./rxvt_unicode.nix {
     rxvt_unicode = super.rxvt_unicode;
   };
 }
diff --git a/tv/5pkgs/override/rxvt_unicode.nix b/tv/5pkgs/override/rxvt_unicode.nix
new file mode 100644
index 000000000..da657fb20
--- /dev/null
+++ b/tv/5pkgs/override/rxvt_unicode.nix
@@ -0,0 +1,9 @@
+{ fetchurl, rxvt_unicode }:
+rxvt_unicode.overrideAttrs (old: {
+  patches = old.patches ++ [
+    (fetchurl {
+      url = https://cgit.krebsco.de/rxvt-unicode/patch/?id=15f3f94;
+      sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymlkz2p";
+    })
+  ];
+})
diff --git a/tv/5pkgs/override/rxvt_unicode/default.nix b/tv/5pkgs/override/rxvt_unicode/default.nix
deleted file mode 100644
index 858a46be6..000000000
--- a/tv/5pkgs/override/rxvt_unicode/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ rxvt_unicode }:
-rxvt_unicode.overrideAttrs (old: {
-  patches = old.patches ++ [
-    ./finish-running-selection.patch
-  ];
-})
diff --git a/tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch b/tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch
deleted file mode 100644
index a342ccf5c..000000000
--- a/tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
-index 56c9a3f..429055d 100644
---- a/src/rxvttoolkit.h
-+++ b/src/rxvttoolkit.h
-@@ -384,6 +384,7 @@ struct rxvt_selection
- {
-   rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term);
-   void run ();
-+  void finish (char *data = 0, unsigned int len = 0);
-   ~rxvt_selection ();
- 
-   rxvt_term *term; // terminal to paste to, may be 0
-@@ -404,7 +405,6 @@ private:
-   void timer_cb (ev::timer &w, int revents); ev::timer timer_ev;
-   void x_cb (XEvent &xev); xevent_watcher x_ev;
- 
--  void finish (char *data = 0, unsigned int len = 0);
-   void stop ();
-   bool request (Atom target, int selnum);
-   void handle_selection (Window win, Atom prop, bool delete_prop);
-diff --git a/src/screen.C b/src/screen.C
-index 9eb375a..77e7109 100644
---- a/src/screen.C
-+++ b/src/screen.C
-@@ -2736,11 +2736,11 @@ rxvt_term::paste (char *data, unsigned int len) NOTHROW
- void
- rxvt_term::selection_request (Time tm, int selnum) NOTHROW
- {
--  if (!selection_req)
--    {
--      selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
--      selection_req->run ();
--    }
-+  if (selection_req)
-+    selection_req->finish ();
-+
-+  selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
-+  selection_req->run ();
- }
- 
- /* ------------------------------------------------------------------------- */

From 478b45cf97007e3aa846a30360de2b1c9833bf85 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 14:39:02 +0100
Subject: [PATCH 02/59] krebs-hosts-*: generate from krebs.hosts

---
 krebs/3modules/hosts.nix          | 57 ++++++++++++++++++++++++++++++-
 krebs/3modules/retiolum-hosts.nix | 26 ++------------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index 0985bb539..eb7fd2283 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -1,6 +1,5 @@
 with import <stockholm/lib>;
 { config, ... }: let
-  # TODO dedup functions with ./retiolum-hosts.nix
   check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
   domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
 in {
@@ -30,6 +29,62 @@ in {
                   map (addr: { ${addr} = aliases; }) net.addrs)
                 (attrValues host.nets))
             (attrValues config.krebs.hosts)));
+
+    nixpkgs.config.packageOverrides = super: let
+      # nameValuePair name value : { "name" : name, "value" : value }
+
+      # addr : str
+      # aliase : str
+      # hostname : str
+      # netname : str
+
+      # addrAliases : nameValuePair addr [alias]
+
+      # hostNetAliases : host -> { ${netname} : [addrAliases] }
+      hostNetAliases = host:
+        mapAttrs (_: net: filter (x: x.name != null) [
+          { name = net.ip4.addr or null; value = net.aliases; }
+          { name = net.ip6.addr or null; value = net.aliases; }
+        ]) host.nets;
+
+      # netAliases : { ${netname} : [addrAliases] }
+      netAliases =
+        foldl'
+          (result: host:
+            foldl'
+              # λ netAliases -> [addrAliases] -> netAliases
+              (result: { name, value }: result // {
+                ${name} = result.${name} or [] ++ value;
+              })
+              result
+              (mapAttrsToList nameValuePair (hostNetAliases host))
+          )
+          {}
+          (attrValues config.krebs.hosts);
+
+      # allAddrAliases : [addrAliases]
+      allAddrAliases =
+        flatten
+          (map
+            (host: attrValues (hostNetAliases host))
+            (attrValues config.krebs.hosts));
+
+      # writeHosts : str -> [addrAliases] -> package
+      writeHosts = name: addrAliases: super.writeText name ''
+        ${concatMapStringsSep
+            "\n"
+            ({ name, value }: "${name} ${toString value}")
+            addrAliases}
+      '';
+    in
+      {
+        krebs-hosts = writeHosts "krebs-hosts" allAddrAliases;
+      }
+      //
+      genAttrs' (attrNames netAliases) (netname: rec {
+        name = "krebs-hosts-${netname}";
+        value = writeHosts name netAliases.${netname};
+      });
   };
 
 }
diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
index ddf85ead7..2da174bea 100644
--- a/krebs/3modules/retiolum-hosts.nix
+++ b/krebs/3modules/retiolum-hosts.nix
@@ -1,28 +1,8 @@
 with import <stockholm/lib>;
-{ config, ... }: let
-  # TODO dedup functions with ./hosts.nix
-  check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
-  domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
-in {
+{ config, pkgs, ... }: {
   nixpkgs.config.packageOverrides = super: {
     retiolum-hosts =
-      super.writeText "retiolum-hosts" ''
-        ${
-          concatStringsSep
-            "\n"
-            (flatten
-              (map
-                (host: let
-                  net = host.nets.retiolum;
-                  aliases = longs;
-                  longs = filter check net.aliases;
-                in
-                  optionals
-                    (aliases != [])
-                    (map (addr: "${addr} ${toString aliases}") net.addrs))
-                (filter (host: hasAttr "retiolum" host.nets)
-                        (attrValues config.krebs.hosts))))
-        }
-      '';
+      trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
+      pkgs.krebs-hosts-retiolum;
   };
 }

From 5c076d9f37dc495b7a61cae84c5600b1ff7a5d09 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 14:40:57 +0100
Subject: [PATCH 03/59] retiolum-hosts: RIP

---
 krebs/3modules/default.nix          | 1 -
 krebs/3modules/retiolum-hosts.nix   | 8 --------
 lass/2configs/websites/lassulus.nix | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 krebs/3modules/retiolum-hosts.nix

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 9303a81fb..c72215e79 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -45,7 +45,6 @@ let
       ./reaktor2.nix
       ./realwallpaper.nix
       ./retiolum-bootstrap.nix
-      ./retiolum-hosts.nix
       ./rtorrent.nix
       ./secret.nix
       ./setuid.nix
diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
deleted file mode 100644
index 2da174bea..000000000
--- a/krebs/3modules/retiolum-hosts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: {
-  nixpkgs.config.packageOverrides = super: {
-    retiolum-hosts =
-      trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
-      pkgs.krebs-hosts-retiolum;
-  };
-}
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 27cadd100..526909e8a 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -61,7 +61,7 @@ in {
       alias ${config.krebs.tinc.retiolum.hostsArchive};
     '';
     locations."= /retiolum.hosts".extraConfig = ''
-      alias ${pkgs.retiolum-hosts};
+      alias ${pkgs.krebs-hosts-retiolum};
     '';
     locations."= /wireguard-key".extraConfig = ''
       alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};

From a09bf933da2d31645872f1e2332507da98fb6a00 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 15:02:05 +0100
Subject: [PATCH 04/59] krebs-hosts_combined: init

---
 krebs/3modules/hosts.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index eb7fd2283..3d572c04d 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -62,13 +62,6 @@ in {
           {}
           (attrValues config.krebs.hosts);
 
-      # allAddrAliases : [addrAliases]
-      allAddrAliases =
-        flatten
-          (map
-            (host: attrValues (hostNetAliases host))
-            (attrValues config.krebs.hosts));
-
       # writeHosts : str -> [addrAliases] -> package
       writeHosts = name: addrAliases: super.writeText name ''
         ${concatMapStringsSep
@@ -78,7 +71,18 @@ in {
       '';
     in
       {
-        krebs-hosts = writeHosts "krebs-hosts" allAddrAliases;
+        # hosts file for all krebs networks
+        krebs-hosts =
+          writeHosts "krebs-hosts" (concatLists [
+            netAliases.internet
+            netAliases.retiolum
+            netAliases.wiregrill
+          ]);
+
+        # combined hosts file for all networks (even custom ones)
+        krebs-hosts_combined =
+          writeHosts "krebs-hosts_combined"
+            (concatLists (attrValues netAliases));
       }
       //
       genAttrs' (attrNames netAliases) (netname: rec {

From 1242c7e25520580e00a2fabf695fb895657144f0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 09:22:06 +0100
Subject: [PATCH 05/59] krebs-hosts-*: don't add lines without alias

---
 krebs/3modules/hosts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index 3d572c04d..7fe01a769 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -42,7 +42,7 @@ in {
 
       # hostNetAliases : host -> { ${netname} : [addrAliases] }
       hostNetAliases = host:
-        mapAttrs (_: net: filter (x: x.name != null) [
+        mapAttrs (_: net: filter (x: x.name != null && x.value != []) [
           { name = net.ip4.addr or null; value = net.aliases; }
           { name = net.ip6.addr or null; value = net.aliases; }
         ]) host.nets;

From 8b6e3765de2c82929ec63843e9a782886eb0da4e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 20:14:29 +0100
Subject: [PATCH 06/59] tv vim-syntax-nix-nested: add writer{Ext,Name}

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 3794628c1..9f78d6e0b 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -250,6 +250,9 @@ let {
           def = k: ''${k}[ \t\r\n]*='';
           writer = k: ''write${k}[^ \t\r\n]*[ \t\r\n]*\("[^"]*"\|[a-z]\+\)'';
 
+          writerExt = k: writerName ''[^"]*\.${k}'';
+          writerName = k: ''write[^ \t\r\n]*[ \t\r\n]*"${k}"'';
+
         in {
           c = {};
           cabal = {};
@@ -257,7 +260,7 @@ let {
           haskell = {};
           jq.extraStart = alts [
             (writer "Jq")
-            ''write[^ \t\r\n]*[ \t\r\n]*"[^"]*\.jq"''
+            (writerExt "jq")
           ];
           javascript.extraStart = ''/\* js \*/'';
           lua = {};
@@ -287,8 +290,10 @@ let {
             (writer (alts (map capitalize shells)))
           ];
           yaml = {};
-          vim.extraStart =
-            ''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
+          vim.extraStart = alts [
+            (writerExt "vim")
+            (writerName ''\([^"]*\.\)\?vimrc'')
+          ];
           xdefaults = {};
         }))}
 

From 5aea1da2e1e545caf8e8f41b2ce9d589562165c2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 20:20:44 +0100
Subject: [PATCH 07/59] tv vim-syntax-nix-nested: detect .vim".text

---
 tv/2configs/vim.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 9f78d6e0b..7e37ef329 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -130,14 +130,14 @@ let {
       '';
     })))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
-      "/syntax/haskell.vim".text = /* vim */ ''
+      "/syntax/haskell.vim".text = ''
         syn region String start=+\[[[:alnum:]]*|+ end=+|]+
 
         hi link ConId Identifier
         hi link VarId Identifier
         hi link hsDelimiter Delimiter
       '';
-      "/syntax/nix.vim".text = /* vim */ ''
+      "/syntax/nix.vim".text = ''
         "" Quit when a (custom) syntax file was already loaded
         "if exists("b:current_syntax")
         "  finish
@@ -291,6 +291,7 @@ let {
           ];
           yaml = {};
           vim.extraStart = alts [
+            (def ''"[^"]*\.vim"\.text'')
             (writerExt "vim")
             (writerName ''\([^"]*\.\)\?vimrc'')
           ];
@@ -334,7 +335,7 @@ let {
 
         set isk=@,48-57,_,192-255,-,'
       '';
-      "/syntax/sed.vim".text = /* vim */ ''
+      "/syntax/sed.vim".text = ''
         syn region sedBranch
           \ matchgroup=sedFunction start="T"
           \ matchgroup=sedSemicolon end=";\|$"

From 9335c2616a01d3d6e21288d79bd64024578e3c38 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 20:24:11 +0100
Subject: [PATCH 08/59] tv vim haskell: isk+='

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 7e37ef329..fe1482817 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -129,6 +129,19 @@ let {
         command! -n=0 -bar ShowSyntax :call ShowSyntax()
       '';
     })))
+    ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" {
+      #
+      # Haskell
+      #
+      "/ftplugin/haskell.vim".text = ''
+        if exists("g:vim_tv_ftplugin_haskell_loaded")
+          finish
+        endif
+        let g:vim_tv_ftplugin_haskell_loaded = 1
+
+        setlocal iskeyword+='
+      '';
+    }))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
       "/syntax/haskell.vim".text = ''
         syn region String start=+\[[[:alnum:]]*|+ end=+|]+

From 4961c28dae4e7b3903fb6b0792960dc4f82ae24c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 21:21:48 +0100
Subject: [PATCH 09/59] tv vim: add TODO ft

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index fe1482817..de843a30f 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -141,6 +141,43 @@ let {
 
         setlocal iskeyword+='
       '';
+      #
+      # TODO
+      #
+      "/ftdetect/todo.vim".text = ''
+        au BufRead,BufNewFile TODO set ft=todo
+      '';
+      "/ftplugin/todo.vim".text = ''
+        setlocal foldmethod=syntax
+      '';
+      "/syntax/todo.vim".text = ''
+        syn match Comment /#.*/
+
+        syn match todoDate /^[1-9]\S*/
+          \ nextgroup=todoSummary
+
+        syn region todoSummary
+          \ contained
+          \ contains=todoTag
+          \ start="." end="$\n"
+          \ nextgroup=todoBlock
+
+        syn match todoTag /\[[a-z]\+\]/hs=s+1,he=e-1
+          \ contained
+
+        syn region todoBlock
+          \ contained
+          \ contains=Comment
+          \ fold
+          \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
+
+        syn sync minlines=1000
+
+        hi todoDate ctermfg=255
+        hi todoSummary ctermfg=229
+        hi todoBlock ctermfg=248
+        hi todoTag ctermfg=217
+      '';
     }))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
       "/syntax/haskell.vim".text = ''

From 4be997d42348cc05065e3439007c8a2d32feaa04 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 23:15:16 +0100
Subject: [PATCH 10/59] tv vim todo: allow A-Z in tags

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index de843a30f..575a3bcb0 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -162,7 +162,7 @@ let {
           \ start="." end="$\n"
           \ nextgroup=todoBlock
 
-        syn match todoTag /\[[a-z]\+\]/hs=s+1,he=e-1
+        syn match todoTag /\[[A-Za-z]\+\]/hs=s+1,he=e-1
           \ contained
 
         syn region todoBlock

From db791d662c433c482e547f70443b35129de8f541 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 3 Feb 2019 13:39:30 +0100
Subject: [PATCH 11/59] tv vim todo: form feed ends a block

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 575a3bcb0..9942ff65b 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -169,7 +169,7 @@ let {
           \ contained
           \ contains=Comment
           \ fold
-          \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
+          \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
 
         syn sync minlines=1000
 

From df0d079ba03c0b2a98fbdede8322e080ffce60ed Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:00:10 +0100
Subject: [PATCH 12/59] tv bash-fzf-history: init

---
 tv/5pkgs/simple/bash-fzf-history.nix | 91 ++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 tv/5pkgs/simple/bash-fzf-history.nix

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
new file mode 100644
index 000000000..e9a21b95d
--- /dev/null
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -0,0 +1,91 @@
+with import <stockholm/lib>;
+{ pkgs
+
+, edit-key ? "ctrl-e"
+, exec-key ? "enter"
+, edit-mark ? "${mark-prefix}${edit-key}"
+, exec-mark ? "${mark-prefix}${exec-key}"
+, edit-command ? "\"\""
+, exec-command ? "accept-line"
+, mark-prefix ? " #FZFKEY:"
+, finish-keyseq ? "\\C-x\\C-p"
+, rebind-keyseq ? "\\C-x\\C-o"
+
+, start-keyseq ? "\\C-f"
+, load-keyseq ? start-keyseq
+}: let
+  script = pkgs.writeBash "bash-fzf-history.sh" ''
+    if ! command -v fzf >/dev/null; then
+      # Alternatively rewrite ${pkgs.fzf}/share/fzf/* to use absolute paths.
+      fzf() {
+        ${pkgs.fzf}/bin/fzf "$@"
+      }
+    fi
+
+    . ${pkgs.fzf}/share/fzf/key-bindings.bash
+    . ${pkgs.fzf}/share/fzf/completion.bash
+
+    FZF_DEFAULT_OPTS='${toString [
+      /* sh */ "--height=40%"
+      /* sh */ "--inline-info"
+      /* sh */ "--min-height=4"
+      /* sh */ "--reverse"
+    ]}'
+
+    __fzf_history__() (
+      result=$(
+        HISTTIMEFORMAT= history |
+        FZF_DEFAULT_OPTS="${toString [
+          /* sh */ "--tac"
+          /* sh */ "--sync"
+          /* sh */ "-n2..,.."
+          /* sh */ "--tiebreak=index"
+          /* sh */ "--bind=ctrl-r:toggle-sort"
+          /* sh */ "--expect=${edit-key},${exec-key}"
+          /* sh */ "$FZF_DEFAULT_OPTS"
+          /* sh */ "+m"
+        ]}" \
+        ${pkgs.fzf}/bin/fzf
+      )
+      if test -n "$result"; then
+        shopt -s extglob
+
+        key=''${result%%$'\n'*}
+        line=''${result##*([^0-9])}
+        index=''${line%%[^0-9]*}
+        command=''${line##*([0-9 ])}
+
+        echo "$command${mark-prefix}$key"
+      else
+        # Ensure no empty new line gets produced when fzf was aborted.
+        echo '${edit-mark}'
+      fi
+    )
+
+    __fzf_rebind_finish_keyseq__() {
+      local suffix=
+      case $READLINE_LINE in
+        *'${edit-mark}')
+          suffix='${edit-mark}'
+          bind '"${finish-keyseq}": ${edit-command}'
+          ;;
+        *'${exec-mark}')
+          suffix='${exec-mark}'
+          bind '"${finish-keyseq}": ${exec-command}'
+          ;;
+      esac
+      READLINE_LINE=${"\${READLINE_LINE:0:-\${#suffix}}"}
+    }
+    bind -x '"${rebind-keyseq}": __fzf_rebind_finish_keyseq__'
+
+    bind '"\C-r": reverse-search-history'
+    bind '"${start-keyseq}": " \C-e\C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er\e^${rebind-keyseq}${finish-keyseq}"'
+
+    echo '# fzf key bindings loaded:' >&2
+    bind -s | ${pkgs.gnugrep}/bin/grep __fzf_ >&2
+  '';
+in
+  script //
+  rec {
+    bind = /* sh */ ''bind -x '"${load-keyseq}": . ${script}' '';
+  }

From 5ddac6d53dd1ad6ae0767ef6a99b0ac7de695e23 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:00:57 +0100
Subject: [PATCH 13/59] tv bash: use fzf-history

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

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index d7673931c..86e5598bb 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -27,6 +27,8 @@ with import <stockholm/lib>;
           export NIX_PATH="stockholm=$HOME/stockholm:$NIX_PATH"
         ;;
       esac
+
+      ${pkgs.bash-fzf-history.bind}
     '';
     promptInit = /* sh */ ''
       case $UID in

From b7ced221a53c2fc95f630348cf5c7befd0c4a904 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:06:17 +0100
Subject: [PATCH 14/59] tv bash: add timestamps to histfile

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

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index 86e5598bb..42914e060 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -8,6 +8,7 @@ with import <stockholm/lib>;
       HISTCONTROL='erasedups:ignorespace'
       HISTSIZE=65536
       HISTFILESIZE=$HISTSIZE
+      HISTTIMEFORMAT=
 
       shopt -s checkhash
       shopt -s histappend histreedit histverify

From 56d8366cfd011a0079ad731438f48280edfcbdca Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:53:31 +0100
Subject: [PATCH 15/59] tv bash-fzf-history: use array instead of extglob

---
 tv/5pkgs/simple/bash-fzf-history.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index e9a21b95d..8b3fe9e58 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -33,7 +33,8 @@ with import <stockholm/lib>;
     ]}'
 
     __fzf_history__() (
-      result=$(
+      IFS=$'\n'
+      result=( $(
         HISTTIMEFORMAT= history |
         FZF_DEFAULT_OPTS="${toString [
           /* sh */ "--tac"
@@ -45,15 +46,18 @@ with import <stockholm/lib>;
           /* sh */ "$FZF_DEFAULT_OPTS"
           /* sh */ "+m"
         ]}" \
-        ${pkgs.fzf}/bin/fzf
-      )
+        ${pkgs.fzf}/bin/fzf |
+        ${pkgs.gnused}/bin/sed '
+          /^ *[0-9]/{
+            s/^ *//
+            s/ \+/\n/;# index
+          }
+        '
+      ) )
       if test -n "$result"; then
-        shopt -s extglob
-
-        key=''${result%%$'\n'*}
-        line=''${result##*([^0-9])}
-        index=''${line%%[^0-9]*}
-        command=''${line##*([0-9 ])}
+        key=''${result[0]}
+        index=''${result[1]}
+        command=''${result[2]}
 
         echo "$command${mark-prefix}$key"
       else

From 79267b99a05a94df40c33ff5f7c651f83ed9334e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:54:03 +0100
Subject: [PATCH 16/59] tv bash-fzf-history: show timestamp

---
 tv/5pkgs/simple/bash-fzf-history.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index 8b3fe9e58..7b92ea0cd 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -35,8 +35,9 @@ with import <stockholm/lib>;
     __fzf_history__() (
       IFS=$'\n'
       result=( $(
-        HISTTIMEFORMAT= history |
+        HISTTIMEFORMAT=$'\e[38;5;244m%Y-%m-%dT%H:%M:%S\e[m  ' history |
         FZF_DEFAULT_OPTS="${toString [
+          /* sh */ "--ansi"
           /* sh */ "--tac"
           /* sh */ "--sync"
           /* sh */ "-n2..,.."
@@ -51,13 +52,15 @@ with import <stockholm/lib>;
           /^ *[0-9]/{
             s/^ *//
             s/ \+/\n/;# index
+            s/ \+/\n/;# date
           }
         '
       ) )
       if test -n "$result"; then
         key=''${result[0]}
         index=''${result[1]}
-        command=''${result[2]}
+        date=''${result[2]}
+        command=''${result[3]}
 
         echo "$command${mark-prefix}$key"
       else

From 9d6875b02e05ebf9bb56247438a3386b1415eb52 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 13:11:46 +0100
Subject: [PATCH 17/59] tv bash-fzf-history: support unknown timestamps

---
 tv/5pkgs/simple/bash-fzf-history.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index 7b92ea0cd..b603dedd9 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -35,7 +35,12 @@ with import <stockholm/lib>;
     __fzf_history__() (
       IFS=$'\n'
       result=( $(
+        # To add "unknown timestamps" to each line of the history:
+        # sed -i '/^#[0-9]/{n;b};s/^/#1\n/' "$HISTFILE"
         HISTTIMEFORMAT=$'\e[38;5;244m%Y-%m-%dT%H:%M:%S\e[m  ' history |
+        ${pkgs.gnused}/bin/sed '
+          s/\(\x1b\[[0-9;]*\)244m1970-[0-9T:-]*/\1237m????-??-??T??:??:??/
+        ' |
         FZF_DEFAULT_OPTS="${toString [
           /* sh */ "--ansi"
           /* sh */ "--tac"

From 8de748b28738c3f4033a68dab8a01fcbeb691afb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 21:11:09 +0100
Subject: [PATCH 18/59] blessings: 2.1.0 -> 2.2.0

---
 krebs/5pkgs/haskell/blessings.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
index 97e4a717c..f730cc72b 100644
--- a/krebs/5pkgs/haskell/blessings.nix
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -1,5 +1,5 @@
 with import <stockholm/lib>;
-{ mkDerivation, base, fetchgit, stdenv }: let
+{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, text }: let
 
   cfg = {
     "18.03" = {
@@ -7,8 +7,8 @@ with import <stockholm/lib>;
       sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
     };
     "18.09" = {
-      version = "2.1.0";
-      sha256 = "0wc8v48bb0bkvypc0j6imvnf8xc8572hykk9sgjhzf2w0ggqxv5d";
+      version = "2.2.0";
+      sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
     };
   }.${versions.majorMinor nixpkgsVersion};
 
@@ -20,7 +20,8 @@ in mkDerivation {
     rev = "refs/tags/v${cfg.version}";
     sha256 = cfg.sha256;
   };
-  libraryHaskellDepends = [ base ];
+  libraryHaskellDepends = [ base text ];
+  testHaskellDepends = [ base hspec QuickCheck ];
   doHaddock = false;
   # WTFPL is the true license, which is unknown to cabal.
   license = stdenv.lib.licenses.wtfpl;

From f995e7b593b02e2194e9e0b6b2d985a2f035d83c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Feb 2019 19:04:19 +0100
Subject: [PATCH 19/59] tv gitrepos: add flameshot-once

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

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 725ddefa8..95ab75b3d 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -47,6 +47,9 @@ let {
     disko = {
       cgit.desc = "declarative partitioning and formatting tool";
     };
+    flameshot-once = {
+      cgit.desc = "flameshot runner that automatically starts/stops the daemon";
+    };
     fswm = {
       cgit.desc = "simple full screen window manager";
     };

From a8fe746cc7f5471522a50d16d20c40e1a9b20369 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Feb 2019 19:06:14 +0100
Subject: [PATCH 20/59] flameshot-once: init at 1.0.0

---
 krebs/5pkgs/haskell/flameshot-once.nix | 20 ++++++++++++++++++++
 krebs/5pkgs/simple/flameshot-once.nix  | 14 ++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 krebs/5pkgs/haskell/flameshot-once.nix
 create mode 100644 krebs/5pkgs/simple/flameshot-once.nix

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
new file mode 100644
index 000000000..b90dd2cb8
--- /dev/null
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -0,0 +1,20 @@
+{ mkDerivation, async, base, blessings, dbus, fetchgit
+, iso8601-time, process, stdenv, text, time, unagi-chan, unix
+}:
+mkDerivation {
+  pname = "flameshot-once";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/flameshot-once";
+    sha256 = "0fjk5pgjy7r0xz4i38qb85x1z4jp8bas2mmgznp7glidz362w390";
+    rev = "fb5636483871fbafe9b286b377c339c8ddf8b4f8";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    async base blessings dbus iso8601-time process text time unagi-chan
+    unix
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/simple/flameshot-once.nix b/krebs/5pkgs/simple/flameshot-once.nix
new file mode 100644
index 000000000..7550a4678
--- /dev/null
+++ b/krebs/5pkgs/simple/flameshot-once.nix
@@ -0,0 +1,14 @@
+{ pkgs }:
+
+pkgs.symlinkJoin {
+  name = "flameshot-once-wrapper";
+  paths = [
+    (pkgs.writeDashBin "flameshot-once" ''
+      export PATH=${pkgs.stdenv.lib.makeBinPath [
+        pkgs.flameshot
+      ]}''${PATH:+:$PATH}
+      exec ${pkgs.haskellPackages.flameshot-once}/bin/flameshot-once "$@"
+    '')
+    pkgs.haskellPackages.flameshot-once
+  ];
+}

From 853d42fd7eff64067e83e121a4e94c6af33c8ac3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Feb 2019 22:09:51 +0100
Subject: [PATCH 21/59] flameshot-once: 1.0.0 -> 1.0.1

---
 krebs/5pkgs/haskell/flameshot-once.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index b90dd2cb8..aa0d94d8f 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -1,20 +1,21 @@
-{ mkDerivation, async, base, blessings, dbus, fetchgit
-, iso8601-time, process, stdenv, text, time, unagi-chan, unix
+{ mkDerivation, async, base, blessings, bytestring, dbus, fetchgit
+, iso8601-time, process, random, stdenv, text, time, unagi-chan
+, unix
 }:
 mkDerivation {
   pname = "flameshot-once";
-  version = "1.0.0";
+  version = "1.0.1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/flameshot-once";
-    sha256 = "0fjk5pgjy7r0xz4i38qb85x1z4jp8bas2mmgznp7glidz362w390";
-    rev = "fb5636483871fbafe9b286b377c339c8ddf8b4f8";
+    sha256 = "01bsgadjk3y3lg19xcadlrqalr4cs028fsivgacqh31fqaq4v243";
+    rev = "03623ce6c011c1e85df7d91aed4458c098ff22ff";
     fetchSubmodules = true;
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    async base blessings dbus iso8601-time process text time unagi-chan
-    unix
+    async base blessings bytestring dbus iso8601-time process random
+    text time unagi-chan unix
   ];
   license = stdenv.lib.licenses.mit;
 }

From 7c8ace182566cdbca89f4d3e2203b38e6e1f23d9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 11:15:58 +0100
Subject: [PATCH 22/59] tv rxvt_unicode: fetch patch

---
 tv/5pkgs/override/default.nix                 |  2 +-
 tv/5pkgs/override/rxvt_unicode.nix            |  9 ++++
 tv/5pkgs/override/rxvt_unicode/default.nix    |  6 ---
 .../finish-running-selection.patch            | 41 -------------------
 4 files changed, 10 insertions(+), 48 deletions(-)
 create mode 100644 tv/5pkgs/override/rxvt_unicode.nix
 delete mode 100644 tv/5pkgs/override/rxvt_unicode/default.nix
 delete mode 100644 tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch

diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index cd7c5645b..99c1b3ec9 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -1,6 +1,6 @@
 with import <stockholm/lib>;
 self: super: {
-  rxvt_unicode = self.callPackage ./rxvt_unicode {
+  rxvt_unicode = self.callPackage ./rxvt_unicode.nix {
     rxvt_unicode = super.rxvt_unicode;
   };
 }
diff --git a/tv/5pkgs/override/rxvt_unicode.nix b/tv/5pkgs/override/rxvt_unicode.nix
new file mode 100644
index 000000000..da657fb20
--- /dev/null
+++ b/tv/5pkgs/override/rxvt_unicode.nix
@@ -0,0 +1,9 @@
+{ fetchurl, rxvt_unicode }:
+rxvt_unicode.overrideAttrs (old: {
+  patches = old.patches ++ [
+    (fetchurl {
+      url = https://cgit.krebsco.de/rxvt-unicode/patch/?id=15f3f94;
+      sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymlkz2p";
+    })
+  ];
+})
diff --git a/tv/5pkgs/override/rxvt_unicode/default.nix b/tv/5pkgs/override/rxvt_unicode/default.nix
deleted file mode 100644
index 858a46be6..000000000
--- a/tv/5pkgs/override/rxvt_unicode/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ rxvt_unicode }:
-rxvt_unicode.overrideAttrs (old: {
-  patches = old.patches ++ [
-    ./finish-running-selection.patch
-  ];
-})
diff --git a/tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch b/tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch
deleted file mode 100644
index a342ccf5c..000000000
--- a/tv/5pkgs/override/rxvt_unicode/finish-running-selection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
-index 56c9a3f..429055d 100644
---- a/src/rxvttoolkit.h
-+++ b/src/rxvttoolkit.h
-@@ -384,6 +384,7 @@ struct rxvt_selection
- {
-   rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term);
-   void run ();
-+  void finish (char *data = 0, unsigned int len = 0);
-   ~rxvt_selection ();
- 
-   rxvt_term *term; // terminal to paste to, may be 0
-@@ -404,7 +405,6 @@ private:
-   void timer_cb (ev::timer &w, int revents); ev::timer timer_ev;
-   void x_cb (XEvent &xev); xevent_watcher x_ev;
- 
--  void finish (char *data = 0, unsigned int len = 0);
-   void stop ();
-   bool request (Atom target, int selnum);
-   void handle_selection (Window win, Atom prop, bool delete_prop);
-diff --git a/src/screen.C b/src/screen.C
-index 9eb375a..77e7109 100644
---- a/src/screen.C
-+++ b/src/screen.C
-@@ -2736,11 +2736,11 @@ rxvt_term::paste (char *data, unsigned int len) NOTHROW
- void
- rxvt_term::selection_request (Time tm, int selnum) NOTHROW
- {
--  if (!selection_req)
--    {
--      selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
--      selection_req->run ();
--    }
-+  if (selection_req)
-+    selection_req->finish ();
-+
-+  selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
-+  selection_req->run ();
- }
- 
- /* ------------------------------------------------------------------------- */

From 6830a9b32a19d3347f005a491d7a2c8f4094090c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 14:39:02 +0100
Subject: [PATCH 23/59] krebs-hosts-*: generate from krebs.hosts

---
 krebs/3modules/hosts.nix          | 57 ++++++++++++++++++++++++++++++-
 krebs/3modules/retiolum-hosts.nix | 26 ++------------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index 0985bb539..eb7fd2283 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -1,6 +1,5 @@
 with import <stockholm/lib>;
 { config, ... }: let
-  # TODO dedup functions with ./retiolum-hosts.nix
   check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
   domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
 in {
@@ -30,6 +29,62 @@ in {
                   map (addr: { ${addr} = aliases; }) net.addrs)
                 (attrValues host.nets))
             (attrValues config.krebs.hosts)));
+
+    nixpkgs.config.packageOverrides = super: let
+      # nameValuePair name value : { "name" : name, "value" : value }
+
+      # addr : str
+      # aliase : str
+      # hostname : str
+      # netname : str
+
+      # addrAliases : nameValuePair addr [alias]
+
+      # hostNetAliases : host -> { ${netname} : [addrAliases] }
+      hostNetAliases = host:
+        mapAttrs (_: net: filter (x: x.name != null) [
+          { name = net.ip4.addr or null; value = net.aliases; }
+          { name = net.ip6.addr or null; value = net.aliases; }
+        ]) host.nets;
+
+      # netAliases : { ${netname} : [addrAliases] }
+      netAliases =
+        foldl'
+          (result: host:
+            foldl'
+              # λ netAliases -> [addrAliases] -> netAliases
+              (result: { name, value }: result // {
+                ${name} = result.${name} or [] ++ value;
+              })
+              result
+              (mapAttrsToList nameValuePair (hostNetAliases host))
+          )
+          {}
+          (attrValues config.krebs.hosts);
+
+      # allAddrAliases : [addrAliases]
+      allAddrAliases =
+        flatten
+          (map
+            (host: attrValues (hostNetAliases host))
+            (attrValues config.krebs.hosts));
+
+      # writeHosts : str -> [addrAliases] -> package
+      writeHosts = name: addrAliases: super.writeText name ''
+        ${concatMapStringsSep
+            "\n"
+            ({ name, value }: "${name} ${toString value}")
+            addrAliases}
+      '';
+    in
+      {
+        krebs-hosts = writeHosts "krebs-hosts" allAddrAliases;
+      }
+      //
+      genAttrs' (attrNames netAliases) (netname: rec {
+        name = "krebs-hosts-${netname}";
+        value = writeHosts name netAliases.${netname};
+      });
   };
 
 }
diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
index ddf85ead7..2da174bea 100644
--- a/krebs/3modules/retiolum-hosts.nix
+++ b/krebs/3modules/retiolum-hosts.nix
@@ -1,28 +1,8 @@
 with import <stockholm/lib>;
-{ config, ... }: let
-  # TODO dedup functions with ./hosts.nix
-  check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
-  domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
-in {
+{ config, pkgs, ... }: {
   nixpkgs.config.packageOverrides = super: {
     retiolum-hosts =
-      super.writeText "retiolum-hosts" ''
-        ${
-          concatStringsSep
-            "\n"
-            (flatten
-              (map
-                (host: let
-                  net = host.nets.retiolum;
-                  aliases = longs;
-                  longs = filter check net.aliases;
-                in
-                  optionals
-                    (aliases != [])
-                    (map (addr: "${addr} ${toString aliases}") net.addrs))
-                (filter (host: hasAttr "retiolum" host.nets)
-                        (attrValues config.krebs.hosts))))
-        }
-      '';
+      trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
+      pkgs.krebs-hosts-retiolum;
   };
 }

From bc4984c7fa6a50052436399364d2de7f76f1cd2e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 14:40:57 +0100
Subject: [PATCH 24/59] retiolum-hosts: RIP

---
 krebs/3modules/default.nix          | 1 -
 krebs/3modules/retiolum-hosts.nix   | 8 --------
 lass/2configs/websites/lassulus.nix | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 krebs/3modules/retiolum-hosts.nix

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 9303a81fb..c72215e79 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -45,7 +45,6 @@ let
       ./reaktor2.nix
       ./realwallpaper.nix
       ./retiolum-bootstrap.nix
-      ./retiolum-hosts.nix
       ./rtorrent.nix
       ./secret.nix
       ./setuid.nix
diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
deleted file mode 100644
index 2da174bea..000000000
--- a/krebs/3modules/retiolum-hosts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: {
-  nixpkgs.config.packageOverrides = super: {
-    retiolum-hosts =
-      trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
-      pkgs.krebs-hosts-retiolum;
-  };
-}
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 27cadd100..526909e8a 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -61,7 +61,7 @@ in {
       alias ${config.krebs.tinc.retiolum.hostsArchive};
     '';
     locations."= /retiolum.hosts".extraConfig = ''
-      alias ${pkgs.retiolum-hosts};
+      alias ${pkgs.krebs-hosts-retiolum};
     '';
     locations."= /wireguard-key".extraConfig = ''
       alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};

From 659cbed237ebbf158374cc85929f97eb1a6fce36 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 15:02:05 +0100
Subject: [PATCH 25/59] krebs-hosts_combined: init

---
 krebs/3modules/hosts.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index eb7fd2283..3d572c04d 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -62,13 +62,6 @@ in {
           {}
           (attrValues config.krebs.hosts);
 
-      # allAddrAliases : [addrAliases]
-      allAddrAliases =
-        flatten
-          (map
-            (host: attrValues (hostNetAliases host))
-            (attrValues config.krebs.hosts));
-
       # writeHosts : str -> [addrAliases] -> package
       writeHosts = name: addrAliases: super.writeText name ''
         ${concatMapStringsSep
@@ -78,7 +71,18 @@ in {
       '';
     in
       {
-        krebs-hosts = writeHosts "krebs-hosts" allAddrAliases;
+        # hosts file for all krebs networks
+        krebs-hosts =
+          writeHosts "krebs-hosts" (concatLists [
+            netAliases.internet
+            netAliases.retiolum
+            netAliases.wiregrill
+          ]);
+
+        # combined hosts file for all networks (even custom ones)
+        krebs-hosts_combined =
+          writeHosts "krebs-hosts_combined"
+            (concatLists (attrValues netAliases));
       }
       //
       genAttrs' (attrNames netAliases) (netname: rec {

From cdb548ac3050c2e9f61a07e6f5eff88383e1114c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 09:22:06 +0100
Subject: [PATCH 26/59] krebs-hosts-*: don't add lines without alias

---
 krebs/3modules/hosts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index 3d572c04d..7fe01a769 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -42,7 +42,7 @@ in {
 
       # hostNetAliases : host -> { ${netname} : [addrAliases] }
       hostNetAliases = host:
-        mapAttrs (_: net: filter (x: x.name != null) [
+        mapAttrs (_: net: filter (x: x.name != null && x.value != []) [
           { name = net.ip4.addr or null; value = net.aliases; }
           { name = net.ip6.addr or null; value = net.aliases; }
         ]) host.nets;

From 1c4810bd407c8ff992eeffa24d5234fefff4826e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 20:14:29 +0100
Subject: [PATCH 27/59] tv vim-syntax-nix-nested: add writer{Ext,Name}

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 3794628c1..9f78d6e0b 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -250,6 +250,9 @@ let {
           def = k: ''${k}[ \t\r\n]*='';
           writer = k: ''write${k}[^ \t\r\n]*[ \t\r\n]*\("[^"]*"\|[a-z]\+\)'';
 
+          writerExt = k: writerName ''[^"]*\.${k}'';
+          writerName = k: ''write[^ \t\r\n]*[ \t\r\n]*"${k}"'';
+
         in {
           c = {};
           cabal = {};
@@ -257,7 +260,7 @@ let {
           haskell = {};
           jq.extraStart = alts [
             (writer "Jq")
-            ''write[^ \t\r\n]*[ \t\r\n]*"[^"]*\.jq"''
+            (writerExt "jq")
           ];
           javascript.extraStart = ''/\* js \*/'';
           lua = {};
@@ -287,8 +290,10 @@ let {
             (writer (alts (map capitalize shells)))
           ];
           yaml = {};
-          vim.extraStart =
-            ''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
+          vim.extraStart = alts [
+            (writerExt "vim")
+            (writerName ''\([^"]*\.\)\?vimrc'')
+          ];
           xdefaults = {};
         }))}
 

From 21a0d53f2fbe652db372c11349e066d66b75e66e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 20:20:44 +0100
Subject: [PATCH 28/59] tv vim-syntax-nix-nested: detect .vim".text

---
 tv/2configs/vim.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 9f78d6e0b..7e37ef329 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -130,14 +130,14 @@ let {
       '';
     })))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
-      "/syntax/haskell.vim".text = /* vim */ ''
+      "/syntax/haskell.vim".text = ''
         syn region String start=+\[[[:alnum:]]*|+ end=+|]+
 
         hi link ConId Identifier
         hi link VarId Identifier
         hi link hsDelimiter Delimiter
       '';
-      "/syntax/nix.vim".text = /* vim */ ''
+      "/syntax/nix.vim".text = ''
         "" Quit when a (custom) syntax file was already loaded
         "if exists("b:current_syntax")
         "  finish
@@ -291,6 +291,7 @@ let {
           ];
           yaml = {};
           vim.extraStart = alts [
+            (def ''"[^"]*\.vim"\.text'')
             (writerExt "vim")
             (writerName ''\([^"]*\.\)\?vimrc'')
           ];
@@ -334,7 +335,7 @@ let {
 
         set isk=@,48-57,_,192-255,-,'
       '';
-      "/syntax/sed.vim".text = /* vim */ ''
+      "/syntax/sed.vim".text = ''
         syn region sedBranch
           \ matchgroup=sedFunction start="T"
           \ matchgroup=sedSemicolon end=";\|$"

From cc063ceb8fc334b3641d5483dc05d1b7ce42c1db Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 20:24:11 +0100
Subject: [PATCH 29/59] tv vim haskell: isk+='

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 7e37ef329..fe1482817 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -129,6 +129,19 @@ let {
         command! -n=0 -bar ShowSyntax :call ShowSyntax()
       '';
     })))
+    ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" {
+      #
+      # Haskell
+      #
+      "/ftplugin/haskell.vim".text = ''
+        if exists("g:vim_tv_ftplugin_haskell_loaded")
+          finish
+        endif
+        let g:vim_tv_ftplugin_haskell_loaded = 1
+
+        setlocal iskeyword+='
+      '';
+    }))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
       "/syntax/haskell.vim".text = ''
         syn region String start=+\[[[:alnum:]]*|+ end=+|]+

From 49f0a670a6ecaf7c229fc29aad2b33f5f4b4779b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 21:21:48 +0100
Subject: [PATCH 30/59] tv vim: add TODO ft

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index fe1482817..de843a30f 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -141,6 +141,43 @@ let {
 
         setlocal iskeyword+='
       '';
+      #
+      # TODO
+      #
+      "/ftdetect/todo.vim".text = ''
+        au BufRead,BufNewFile TODO set ft=todo
+      '';
+      "/ftplugin/todo.vim".text = ''
+        setlocal foldmethod=syntax
+      '';
+      "/syntax/todo.vim".text = ''
+        syn match Comment /#.*/
+
+        syn match todoDate /^[1-9]\S*/
+          \ nextgroup=todoSummary
+
+        syn region todoSummary
+          \ contained
+          \ contains=todoTag
+          \ start="." end="$\n"
+          \ nextgroup=todoBlock
+
+        syn match todoTag /\[[a-z]\+\]/hs=s+1,he=e-1
+          \ contained
+
+        syn region todoBlock
+          \ contained
+          \ contains=Comment
+          \ fold
+          \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
+
+        syn sync minlines=1000
+
+        hi todoDate ctermfg=255
+        hi todoSummary ctermfg=229
+        hi todoBlock ctermfg=248
+        hi todoTag ctermfg=217
+      '';
     }))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
       "/syntax/haskell.vim".text = ''

From 0e97f41f6ece2d878c98c234ba59f6b73c6cc0f8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 23:15:16 +0100
Subject: [PATCH 31/59] tv vim todo: allow A-Z in tags

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index de843a30f..575a3bcb0 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -162,7 +162,7 @@ let {
           \ start="." end="$\n"
           \ nextgroup=todoBlock
 
-        syn match todoTag /\[[a-z]\+\]/hs=s+1,he=e-1
+        syn match todoTag /\[[A-Za-z]\+\]/hs=s+1,he=e-1
           \ contained
 
         syn region todoBlock

From 820b7cc1f76767d9cead8022668c5932fec00d28 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 3 Feb 2019 13:39:30 +0100
Subject: [PATCH 32/59] tv vim todo: form feed ends a block

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 575a3bcb0..9942ff65b 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -169,7 +169,7 @@ let {
           \ contained
           \ contains=Comment
           \ fold
-          \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
+          \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
 
         syn sync minlines=1000
 

From 45d6a5385a274c25da9d0720370e7b38baeb13fe Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:00:10 +0100
Subject: [PATCH 33/59] tv bash-fzf-history: init

---
 tv/5pkgs/simple/bash-fzf-history.nix | 91 ++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 tv/5pkgs/simple/bash-fzf-history.nix

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
new file mode 100644
index 000000000..e9a21b95d
--- /dev/null
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -0,0 +1,91 @@
+with import <stockholm/lib>;
+{ pkgs
+
+, edit-key ? "ctrl-e"
+, exec-key ? "enter"
+, edit-mark ? "${mark-prefix}${edit-key}"
+, exec-mark ? "${mark-prefix}${exec-key}"
+, edit-command ? "\"\""
+, exec-command ? "accept-line"
+, mark-prefix ? " #FZFKEY:"
+, finish-keyseq ? "\\C-x\\C-p"
+, rebind-keyseq ? "\\C-x\\C-o"
+
+, start-keyseq ? "\\C-f"
+, load-keyseq ? start-keyseq
+}: let
+  script = pkgs.writeBash "bash-fzf-history.sh" ''
+    if ! command -v fzf >/dev/null; then
+      # Alternatively rewrite ${pkgs.fzf}/share/fzf/* to use absolute paths.
+      fzf() {
+        ${pkgs.fzf}/bin/fzf "$@"
+      }
+    fi
+
+    . ${pkgs.fzf}/share/fzf/key-bindings.bash
+    . ${pkgs.fzf}/share/fzf/completion.bash
+
+    FZF_DEFAULT_OPTS='${toString [
+      /* sh */ "--height=40%"
+      /* sh */ "--inline-info"
+      /* sh */ "--min-height=4"
+      /* sh */ "--reverse"
+    ]}'
+
+    __fzf_history__() (
+      result=$(
+        HISTTIMEFORMAT= history |
+        FZF_DEFAULT_OPTS="${toString [
+          /* sh */ "--tac"
+          /* sh */ "--sync"
+          /* sh */ "-n2..,.."
+          /* sh */ "--tiebreak=index"
+          /* sh */ "--bind=ctrl-r:toggle-sort"
+          /* sh */ "--expect=${edit-key},${exec-key}"
+          /* sh */ "$FZF_DEFAULT_OPTS"
+          /* sh */ "+m"
+        ]}" \
+        ${pkgs.fzf}/bin/fzf
+      )
+      if test -n "$result"; then
+        shopt -s extglob
+
+        key=''${result%%$'\n'*}
+        line=''${result##*([^0-9])}
+        index=''${line%%[^0-9]*}
+        command=''${line##*([0-9 ])}
+
+        echo "$command${mark-prefix}$key"
+      else
+        # Ensure no empty new line gets produced when fzf was aborted.
+        echo '${edit-mark}'
+      fi
+    )
+
+    __fzf_rebind_finish_keyseq__() {
+      local suffix=
+      case $READLINE_LINE in
+        *'${edit-mark}')
+          suffix='${edit-mark}'
+          bind '"${finish-keyseq}": ${edit-command}'
+          ;;
+        *'${exec-mark}')
+          suffix='${exec-mark}'
+          bind '"${finish-keyseq}": ${exec-command}'
+          ;;
+      esac
+      READLINE_LINE=${"\${READLINE_LINE:0:-\${#suffix}}"}
+    }
+    bind -x '"${rebind-keyseq}": __fzf_rebind_finish_keyseq__'
+
+    bind '"\C-r": reverse-search-history'
+    bind '"${start-keyseq}": " \C-e\C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er\e^${rebind-keyseq}${finish-keyseq}"'
+
+    echo '# fzf key bindings loaded:' >&2
+    bind -s | ${pkgs.gnugrep}/bin/grep __fzf_ >&2
+  '';
+in
+  script //
+  rec {
+    bind = /* sh */ ''bind -x '"${load-keyseq}": . ${script}' '';
+  }

From 5daf58f556491a8d8fa07329c05c9e4c10a0da7f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:00:57 +0100
Subject: [PATCH 34/59] tv bash: use fzf-history

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

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index d7673931c..86e5598bb 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -27,6 +27,8 @@ with import <stockholm/lib>;
           export NIX_PATH="stockholm=$HOME/stockholm:$NIX_PATH"
         ;;
       esac
+
+      ${pkgs.bash-fzf-history.bind}
     '';
     promptInit = /* sh */ ''
       case $UID in

From 72de16e0a46a5f64e60df7eb27b0450b567c5ebb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:06:17 +0100
Subject: [PATCH 35/59] tv bash: add timestamps to histfile

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

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index 86e5598bb..42914e060 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -8,6 +8,7 @@ with import <stockholm/lib>;
       HISTCONTROL='erasedups:ignorespace'
       HISTSIZE=65536
       HISTFILESIZE=$HISTSIZE
+      HISTTIMEFORMAT=
 
       shopt -s checkhash
       shopt -s histappend histreedit histverify

From 6cfbc67cb236671af6781bd6a5b628d5300f67ab Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:53:31 +0100
Subject: [PATCH 36/59] tv bash-fzf-history: use array instead of extglob

---
 tv/5pkgs/simple/bash-fzf-history.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index e9a21b95d..8b3fe9e58 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -33,7 +33,8 @@ with import <stockholm/lib>;
     ]}'
 
     __fzf_history__() (
-      result=$(
+      IFS=$'\n'
+      result=( $(
         HISTTIMEFORMAT= history |
         FZF_DEFAULT_OPTS="${toString [
           /* sh */ "--tac"
@@ -45,15 +46,18 @@ with import <stockholm/lib>;
           /* sh */ "$FZF_DEFAULT_OPTS"
           /* sh */ "+m"
         ]}" \
-        ${pkgs.fzf}/bin/fzf
-      )
+        ${pkgs.fzf}/bin/fzf |
+        ${pkgs.gnused}/bin/sed '
+          /^ *[0-9]/{
+            s/^ *//
+            s/ \+/\n/;# index
+          }
+        '
+      ) )
       if test -n "$result"; then
-        shopt -s extglob
-
-        key=''${result%%$'\n'*}
-        line=''${result##*([^0-9])}
-        index=''${line%%[^0-9]*}
-        command=''${line##*([0-9 ])}
+        key=''${result[0]}
+        index=''${result[1]}
+        command=''${result[2]}
 
         echo "$command${mark-prefix}$key"
       else

From c1bd2a0851dc163a77699b00759f8ae4aa38a65d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 11:54:03 +0100
Subject: [PATCH 37/59] tv bash-fzf-history: show timestamp

---
 tv/5pkgs/simple/bash-fzf-history.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index 8b3fe9e58..7b92ea0cd 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -35,8 +35,9 @@ with import <stockholm/lib>;
     __fzf_history__() (
       IFS=$'\n'
       result=( $(
-        HISTTIMEFORMAT= history |
+        HISTTIMEFORMAT=$'\e[38;5;244m%Y-%m-%dT%H:%M:%S\e[m  ' history |
         FZF_DEFAULT_OPTS="${toString [
+          /* sh */ "--ansi"
           /* sh */ "--tac"
           /* sh */ "--sync"
           /* sh */ "-n2..,.."
@@ -51,13 +52,15 @@ with import <stockholm/lib>;
           /^ *[0-9]/{
             s/^ *//
             s/ \+/\n/;# index
+            s/ \+/\n/;# date
           }
         '
       ) )
       if test -n "$result"; then
         key=''${result[0]}
         index=''${result[1]}
-        command=''${result[2]}
+        date=''${result[2]}
+        command=''${result[3]}
 
         echo "$command${mark-prefix}$key"
       else

From 0b60d5da163980483a233ab60492c9c5a5c59cf8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 13:11:46 +0100
Subject: [PATCH 38/59] tv bash-fzf-history: support unknown timestamps

---
 tv/5pkgs/simple/bash-fzf-history.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index 7b92ea0cd..b603dedd9 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -35,7 +35,12 @@ with import <stockholm/lib>;
     __fzf_history__() (
       IFS=$'\n'
       result=( $(
+        # To add "unknown timestamps" to each line of the history:
+        # sed -i '/^#[0-9]/{n;b};s/^/#1\n/' "$HISTFILE"
         HISTTIMEFORMAT=$'\e[38;5;244m%Y-%m-%dT%H:%M:%S\e[m  ' history |
+        ${pkgs.gnused}/bin/sed '
+          s/\(\x1b\[[0-9;]*\)244m1970-[0-9T:-]*/\1237m????-??-??T??:??:??/
+        ' |
         FZF_DEFAULT_OPTS="${toString [
           /* sh */ "--ansi"
           /* sh */ "--tac"

From d3f9c8efccd2d6eca7d888c3ae19f2ab8fd58911 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Feb 2019 21:11:09 +0100
Subject: [PATCH 39/59] blessings: 2.1.0 -> 2.2.0

---
 krebs/5pkgs/haskell/blessings.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
index 97e4a717c..f730cc72b 100644
--- a/krebs/5pkgs/haskell/blessings.nix
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -1,5 +1,5 @@
 with import <stockholm/lib>;
-{ mkDerivation, base, fetchgit, stdenv }: let
+{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, text }: let
 
   cfg = {
     "18.03" = {
@@ -7,8 +7,8 @@ with import <stockholm/lib>;
       sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
     };
     "18.09" = {
-      version = "2.1.0";
-      sha256 = "0wc8v48bb0bkvypc0j6imvnf8xc8572hykk9sgjhzf2w0ggqxv5d";
+      version = "2.2.0";
+      sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
     };
   }.${versions.majorMinor nixpkgsVersion};
 
@@ -20,7 +20,8 @@ in mkDerivation {
     rev = "refs/tags/v${cfg.version}";
     sha256 = cfg.sha256;
   };
-  libraryHaskellDepends = [ base ];
+  libraryHaskellDepends = [ base text ];
+  testHaskellDepends = [ base hspec QuickCheck ];
   doHaddock = false;
   # WTFPL is the true license, which is unknown to cabal.
   license = stdenv.lib.licenses.wtfpl;

From 30b59aa4d86d87c6aa8778c6c309d40b3724ca64 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Feb 2019 19:04:19 +0100
Subject: [PATCH 40/59] tv gitrepos: add flameshot-once

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

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 725ddefa8..95ab75b3d 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -47,6 +47,9 @@ let {
     disko = {
       cgit.desc = "declarative partitioning and formatting tool";
     };
+    flameshot-once = {
+      cgit.desc = "flameshot runner that automatically starts/stops the daemon";
+    };
     fswm = {
       cgit.desc = "simple full screen window manager";
     };

From 24d008d92d24633054e37dd69f983512bf49a69d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Feb 2019 19:06:14 +0100
Subject: [PATCH 41/59] flameshot-once: init at 1.0.0

---
 krebs/5pkgs/haskell/flameshot-once.nix | 20 ++++++++++++++++++++
 krebs/5pkgs/simple/flameshot-once.nix  | 14 ++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 krebs/5pkgs/haskell/flameshot-once.nix
 create mode 100644 krebs/5pkgs/simple/flameshot-once.nix

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
new file mode 100644
index 000000000..b90dd2cb8
--- /dev/null
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -0,0 +1,20 @@
+{ mkDerivation, async, base, blessings, dbus, fetchgit
+, iso8601-time, process, stdenv, text, time, unagi-chan, unix
+}:
+mkDerivation {
+  pname = "flameshot-once";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/flameshot-once";
+    sha256 = "0fjk5pgjy7r0xz4i38qb85x1z4jp8bas2mmgznp7glidz362w390";
+    rev = "fb5636483871fbafe9b286b377c339c8ddf8b4f8";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    async base blessings dbus iso8601-time process text time unagi-chan
+    unix
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/simple/flameshot-once.nix b/krebs/5pkgs/simple/flameshot-once.nix
new file mode 100644
index 000000000..7550a4678
--- /dev/null
+++ b/krebs/5pkgs/simple/flameshot-once.nix
@@ -0,0 +1,14 @@
+{ pkgs }:
+
+pkgs.symlinkJoin {
+  name = "flameshot-once-wrapper";
+  paths = [
+    (pkgs.writeDashBin "flameshot-once" ''
+      export PATH=${pkgs.stdenv.lib.makeBinPath [
+        pkgs.flameshot
+      ]}''${PATH:+:$PATH}
+      exec ${pkgs.haskellPackages.flameshot-once}/bin/flameshot-once "$@"
+    '')
+    pkgs.haskellPackages.flameshot-once
+  ];
+}

From 76fd127a7f1bedd6951322b6401076dd4ee48a78 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Feb 2019 22:09:51 +0100
Subject: [PATCH 42/59] flameshot-once: 1.0.0 -> 1.0.1

---
 krebs/5pkgs/haskell/flameshot-once.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index b90dd2cb8..aa0d94d8f 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -1,20 +1,21 @@
-{ mkDerivation, async, base, blessings, dbus, fetchgit
-, iso8601-time, process, stdenv, text, time, unagi-chan, unix
+{ mkDerivation, async, base, blessings, bytestring, dbus, fetchgit
+, iso8601-time, process, random, stdenv, text, time, unagi-chan
+, unix
 }:
 mkDerivation {
   pname = "flameshot-once";
-  version = "1.0.0";
+  version = "1.0.1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/flameshot-once";
-    sha256 = "0fjk5pgjy7r0xz4i38qb85x1z4jp8bas2mmgznp7glidz362w390";
-    rev = "fb5636483871fbafe9b286b377c339c8ddf8b4f8";
+    sha256 = "01bsgadjk3y3lg19xcadlrqalr4cs028fsivgacqh31fqaq4v243";
+    rev = "03623ce6c011c1e85df7d91aed4458c098ff22ff";
     fetchSubmodules = true;
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    async base blessings dbus iso8601-time process text time unagi-chan
-    unix
+    async base blessings bytestring dbus iso8601-time process random
+    text time unagi-chan unix
   ];
   license = stdenv.lib.licenses.mit;
 }

From 3a2d5affbb7766af4776f21b308c425008a4943d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 8 Feb 2019 09:43:33 +0100
Subject: [PATCH 43/59] external: actually import palo.nix

---
 krebs/3modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index c72215e79..9c2f53cbe 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -100,6 +100,7 @@ let
     { krebs = import ./krebs  { inherit config; }; }
     { krebs = import ./lass   { inherit config; }; }
     { krebs = import ./makefu { inherit config; }; }
+    { krebs = import ./external/palo.nix { inherit config; }; }
     { krebs = import ./tv     { inherit config; }; }
     {
       krebs.dns.providers = {

From 5d4ca6447887369ab4c5c70aa12f783b0485a111 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 8 Feb 2019 17:05:47 +0100
Subject: [PATCH 44/59] nixpkgs: 97e0d53 -> b01a89d

---
 krebs/nixpkgs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 614d5bccf..2fd2839b9 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "97e0d53d669cd07f0750a42fd535524b3cdd46d1",
-  "date": "2019-01-15T00:11:44+01:00",
-  "sha256": "111xa7qn9142dar29cil4br2mvn8f1rbiy310lkhwl73126fq8dw",
+  "rev": "b01a89d58f117c485f16c97a388da6227d8f0103",
+  "date": "2019-02-08T10:50:49+01:00",
+  "sha256": "1s2jdfvqjviiiq897sd6fkmc8ffyca7agmxynp4w873rfjdz10yi",
   "fetchSubmodules": false
 }

From 7f40ff9b5c763f5706b8e71f3f618363b6cd9781 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 8 Feb 2019 17:26:44 +0100
Subject: [PATCH 45/59] flameshot-once: use qt5.qtbase

---
 krebs/5pkgs/simple/flameshot-once.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/krebs/5pkgs/simple/flameshot-once.nix b/krebs/5pkgs/simple/flameshot-once.nix
index 7550a4678..4cbc92a63 100644
--- a/krebs/5pkgs/simple/flameshot-once.nix
+++ b/krebs/5pkgs/simple/flameshot-once.nix
@@ -6,7 +6,8 @@ pkgs.symlinkJoin {
     (pkgs.writeDashBin "flameshot-once" ''
       export PATH=${pkgs.stdenv.lib.makeBinPath [
         pkgs.flameshot
-      ]}''${PATH:+:$PATH}
+        pkgs.qt5.qtbase
+      ]}
       exec ${pkgs.haskellPackages.flameshot-once}/bin/flameshot-once "$@"
     '')
     pkgs.haskellPackages.flameshot-once

From 1b526ec1a597882b7629e992c7579ee109282aa7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 8 Feb 2019 17:46:32 +0100
Subject: [PATCH 46/59] flameshot-once: add config

---
 krebs/5pkgs/simple/flameshot-once.nix         |  15 ---
 krebs/5pkgs/simple/flameshot-once/default.nix |  26 ++++
 krebs/5pkgs/simple/flameshot-once/profile.nix | 123 ++++++++++++++++++
 3 files changed, 149 insertions(+), 15 deletions(-)
 delete mode 100644 krebs/5pkgs/simple/flameshot-once.nix
 create mode 100644 krebs/5pkgs/simple/flameshot-once/default.nix
 create mode 100644 krebs/5pkgs/simple/flameshot-once/profile.nix

diff --git a/krebs/5pkgs/simple/flameshot-once.nix b/krebs/5pkgs/simple/flameshot-once.nix
deleted file mode 100644
index 4cbc92a63..000000000
--- a/krebs/5pkgs/simple/flameshot-once.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs }:
-
-pkgs.symlinkJoin {
-  name = "flameshot-once-wrapper";
-  paths = [
-    (pkgs.writeDashBin "flameshot-once" ''
-      export PATH=${pkgs.stdenv.lib.makeBinPath [
-        pkgs.flameshot
-        pkgs.qt5.qtbase
-      ]}
-      exec ${pkgs.haskellPackages.flameshot-once}/bin/flameshot-once "$@"
-    '')
-    pkgs.haskellPackages.flameshot-once
-  ];
-}
diff --git a/krebs/5pkgs/simple/flameshot-once/default.nix b/krebs/5pkgs/simple/flameshot-once/default.nix
new file mode 100644
index 000000000..344c5b90a
--- /dev/null
+++ b/krebs/5pkgs/simple/flameshot-once/default.nix
@@ -0,0 +1,26 @@
+with import <stockholm/lib>;
+{ pkgs, ... }@args:
+
+let
+  # config cannot be declared in the input attribute set because that would
+  # cause callPackage to inject the wrong config.  Instead, get it from ...
+  # via args.
+  config = args.config or {};
+in
+
+  pkgs.symlinkJoin {
+    name = "flameshot-once-wrapper";
+    paths = [
+      (pkgs.writeDashBin "flameshot-once" ''
+        export PATH=${makeBinPath [
+          pkgs.flameshot
+          pkgs.qt5.qtbase
+        ]}
+        ${optionalString (config != null) /* sh */ ''
+          . ${import ./profile.nix { inherit config pkgs; }}
+        ''}
+        exec ${pkgs.haskellPackages.flameshot-once}/bin/flameshot-once "$@"
+      '')
+      pkgs.haskellPackages.flameshot-once
+    ];
+  }
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
new file mode 100644
index 000000000..bfe571ff5
--- /dev/null
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -0,0 +1,123 @@
+with import <stockholm/lib>;
+{ config, pkgs }:
+let
+
+  # Refs https://github.com/lupoDharkael/flameshot/blob/master/src/widgets/capture/capturebutton.h
+  ButtonType = {
+    PENCIL             = 0;
+    DRAWER             = 1;
+    ARROW              = 2;
+    SELECTION          = 3;
+    RECTANGLE          = 4;
+    CIRCLE             = 5;
+    MARKER             = 6;
+    SELECTIONINDICATOR = 7;
+    MOVESELECTION      = 8;
+    UNDO               = 9;
+    COPY               = 10;
+    SAVE               = 11;
+    EXIT               = 12;
+    IMAGEUPLOADER      = 13;
+    OPEN_APP           = 14;
+    BLUR               = 15;
+    REDO               = 16;
+    PIN                = 17;
+    TEXT               = 18;
+  };
+
+  cfg = eval.config;
+
+  eval = evalModules {
+    modules = singleton {
+      _file = toString ./config.nix;
+      imports = singleton config;
+      options = {
+        buttons = mkOption {
+          apply = map (name: ButtonType.${name});
+          default = [
+            "PENCIL"
+            "DRAWER"
+            "ARROW"
+            "SELECTION"
+            "RECTANGLE"
+            "CIRCLE"
+            "MARKER"
+            "SELECTIONINDICATOR"
+            "MOVESELECTION"
+            "UNDO"
+            "COPY"
+            "SAVE"
+            "EXIT"
+            "BLUR"
+          ];
+          type = types.listOf (types.enum (attrNames ButtonType));
+        };
+        disabledTrayIcon = mkOption {
+          default = true;
+          type = types.bool;
+        };
+        drawThickness = mkOption {
+          default = 8;
+          type = types.positive;
+        };
+        savePath = mkOption {
+          default = "/tmp";
+          type = types.absolute-pathname;
+        };
+        showDesktopNotification = mkOption {
+          default = false;
+          type = types.bool;
+        };
+        showHelp = mkOption {
+          default = false;
+          type = types.bool;
+        };
+      };
+    };
+  };
+
+  hexchars = stringToCharacters "0123456789abcdef";
+
+  # Encode integer to C-escaped string of bytes, little endian / LSB 0
+  le = rec {
+    x1 = i: let
+      i0 = mod i 16;
+      i1 = i / 16;
+    in
+      "\\x${elemAt hexchars i1}${elemAt hexchars i0}";
+
+    x2 = i: let
+      i0 = mod i 256;
+      i1 = i / 256;
+    in
+      "${x1 i0}${x1 i1}";
+
+    x4 = i: let
+      i0 = mod i 65536;
+      i1 = i / 65536;
+    in
+      "${x2 i0}${x2 i1}";
+  };
+
+  toQList = t: xs:
+    assert t == "int";
+    "QList<${t}>${le.x4 0}${le.x4 (length xs)}${concatMapStrings le.x4 xs}";
+
+  XDG_CONFIG_HOME = pkgs.write "flameshot-config" {
+    "/Dharkael/flameshot.ini".text = ''
+      [General]
+      buttons=@Variant(\0\0\0\x7f\0\0\0\v${toQList "int" cfg.buttons})
+      disabledTrayIcon=${toJSON cfg.disabledTrayIcon}
+      drawThickness=${toJSON cfg.drawThickness}
+      savePath=${toJSON cfg.savePath}
+      showDesktopNotification=${toJSON cfg.showDesktopNotification}
+      showHelp=${toJSON cfg.showHelp}
+    '';
+  };
+
+in
+
+  pkgs.writeDash "flameshot.profile" ''
+    export FLAMESHOT_CAPTURE_PATH=${cfg.savePath}
+    export XDG_CONFIG_HOME=${XDG_CONFIG_HOME}
+  ''

From 90b227622c6950845c24f62d03e2eb073005be6e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 8 Feb 2019 18:02:29 +0100
Subject: [PATCH 47/59] tv xmonad: add dbus

---
 tv/2configs/xserver/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index f68e8e681..051e12ef0 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -48,10 +48,24 @@ in {
 
   systemd.services.xmonad = let
     xmonad = "${pkgs.haskellPackages.xmonad-tv}/bin/xmonad";
-    xmonad-prepare = pkgs.writeDash "xmonad-prepare" ''
+    xmonad-start = pkgs.writeDash "xmonad-start" ''
       ${pkgs.coreutils}/bin/mkdir -p "$XMONAD_CACHE_DIR"
       ${pkgs.coreutils}/bin/mkdir -p "$XMONAD_CONFIG_DIR"
       ${pkgs.coreutils}/bin/mkdir -p "$XMONAD_DATA_DIR"
+
+      f=$HOME/.dbus/session-bus/$(${pkgs.coreutils}/bin/cat /etc/machine-id)-${
+        toString config.services.xserver.display
+      }
+      if test -e "$f" &&
+          . "$f" &&
+          ${pkgs.coreutils}/bin/kill -0 "$DBUS_SESSION_BUS_PID"
+      then
+        export DBUS_SESSION_BUS_ADDRESS
+      else
+        eval "$(${pkgs.dbus.lib}/bin/dbus-launch --sh-syntax)"
+      fi
+
+      exec ${xmonad}
     '';
     xmonad-ready = pkgs.writeDash "xmonad-ready" ''
       {
@@ -97,8 +111,7 @@ in {
       "/run/wrappers" # for su
     ];
     serviceConfig = {
-      ExecStartPre = "@${xmonad-prepare} xmonad-prepare";
-      ExecStart = "@${xmonad} xmonad-${currentSystem}";
+      ExecStart = "@${xmonad-start} xmonad-${currentSystem}";
       ExecStop = "@${xmonad} xmonad-${currentSystem} --shutdown";
       SyslogIdentifier = "xmonad";
       User = cfg.user.name;

From f9496394975782a3aee0998a9a6d5882b67c0901 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 9 Feb 2019 02:34:32 +0100
Subject: [PATCH 48/59] flameshot-once: make filenamePattern configurable

---
 krebs/5pkgs/simple/flameshot-once/profile.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index bfe571ff5..69adb240d 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -60,6 +60,12 @@ let
           default = 8;
           type = types.positive;
         };
+        filenamePattern = mkOption {
+          default = "%FT%T%z_flameshot.png";
+          type =
+            # This is types.filename extended by [%:][%:+]*
+            types.addCheck types.str (test "[%:0-9A-Za-z._][%:+0-9A-Za-z._-]*");
+        };
         savePath = mkOption {
           default = "/tmp";
           type = types.absolute-pathname;
@@ -109,6 +115,7 @@ let
       buttons=@Variant(\0\0\0\x7f\0\0\0\v${toQList "int" cfg.buttons})
       disabledTrayIcon=${toJSON cfg.disabledTrayIcon}
       drawThickness=${toJSON cfg.drawThickness}
+      filenamePattern=${toJSON cfg.filenamePattern}
       savePath=${toJSON cfg.savePath}
       showDesktopNotification=${toJSON cfg.showDesktopNotification}
       showHelp=${toJSON cfg.showHelp}

From e29debea42379fcb529057edf1963928466b0181 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 9 Feb 2019 02:33:58 +0100
Subject: [PATCH 49/59] flameshot-once: 1.0.1 -> 1.1.0

---
 krebs/5pkgs/haskell/flameshot-once.nix        | 6 +++---
 krebs/5pkgs/simple/flameshot-once/default.nix | 1 +
 krebs/5pkgs/simple/flameshot-once/profile.nix | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index aa0d94d8f..89b95ca07 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -4,11 +4,11 @@
 }:
 mkDerivation {
   pname = "flameshot-once";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/flameshot-once";
-    sha256 = "01bsgadjk3y3lg19xcadlrqalr4cs028fsivgacqh31fqaq4v243";
-    rev = "03623ce6c011c1e85df7d91aed4458c098ff22ff";
+    sha256 = "158ha1yyj3p3mdjjga62j91ml83nhrsg34xbg3dir5cb399j8pxx";
+    rev = "9d688b6ffad14912bd1afe42555747cb3d213d95";
     fetchSubmodules = true;
   };
   isLibrary = false;
diff --git a/krebs/5pkgs/simple/flameshot-once/default.nix b/krebs/5pkgs/simple/flameshot-once/default.nix
index 344c5b90a..c442a2e96 100644
--- a/krebs/5pkgs/simple/flameshot-once/default.nix
+++ b/krebs/5pkgs/simple/flameshot-once/default.nix
@@ -15,6 +15,7 @@ in
         export PATH=${makeBinPath [
           pkgs.flameshot
           pkgs.qt5.qtbase
+          pkgs.xclip
         ]}
         ${optionalString (config != null) /* sh */ ''
           . ${import ./profile.nix { inherit config pkgs; }}
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index 69adb240d..4fcbd62c0 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -45,7 +45,6 @@ let
             "SELECTIONINDICATOR"
             "MOVESELECTION"
             "UNDO"
-            "COPY"
             "SAVE"
             "EXIT"
             "BLUR"

From e51a19cb8be0ae1d9a45d1c22b45ec71e099a2ff Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 9 Feb 2019 04:04:23 +0100
Subject: [PATCH 50/59] tv xmonad: remove unused language extensions

---
 tv/5pkgs/haskell/xmonad-tv/src/main.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index b7d4e9bca..e78480219 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -1,8 +1,4 @@
-{-# LANGUAGE DeriveDataTypeable #-} -- for XS
-{-# LANGUAGE FlexibleContexts #-} -- for xmonad'
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
 
 module Main (main) where
 

From d3b23eac6eb79076b1b60615d26bfebafc927e65 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 9 Feb 2019 04:05:39 +0100
Subject: [PATCH 51/59] tv xmonad: use launch

---
 tv/5pkgs/haskell/xmonad-tv/src/main.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index e78480219..c528017d7 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -47,7 +47,7 @@ mainNoArgs = do
     let width = 1366
     workspaces0 <- getWorkspaces0
     handleShutdownEvent <- newShutdownEventHandler
-    xmonad
+    launch
         $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
         $ def
             { terminal          = Paths.urxvtc

From 8371e21c10bdb5d5353cc581efba7e09e4ce7a91 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 10 Feb 2019 14:22:54 +0100
Subject: [PATCH 52/59] tv iptables: add extra{4,6}

---
 tv/3modules/iptables.nix | 55 ++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 13 deletions(-)

diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index 56861dc74..3f1df9220 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -9,6 +9,33 @@ let {
     config = lib.mkIf cfg.enable imp;
   };
 
+  extraTypes = {
+    rules = types.submodule {
+      options = {
+        nat.OUTPUT = mkOption {
+          type = with types; listOf str;
+          default = [];
+        };
+        nat.PREROUTING = mkOption {
+          type = with types; listOf str;
+          default = [];
+        };
+        nat.POSTROUTING = mkOption {
+          type = with types; listOf str;
+          default = [];
+        };
+        filter.FORWARD = mkOption {
+          type = with types; listOf str;
+          default = [];
+        };
+        filter.INPUT = mkOption {
+          type = with types; listOf str;
+          default = [];
+        };
+      };
+    };
+  };
+
   api = {
     enable = mkEnableOption "tv.iptables";
 
@@ -37,19 +64,19 @@ let {
       default = [];
     };
 
-    extra = {
-      nat.POSTROUTING = mkOption {
-        type = with types; listOf str;
-        default = [];
-      };
-      filter.FORWARD = mkOption {
-        type = with types; listOf str;
-        default = [];
-      };
-      filter.INPUT = mkOption {
-        type = with types; listOf str;
-        default = [];
-      };
+    extra = mkOption {
+      default = {};
+      type = extraTypes.rules;
+    };
+
+    extra4 = mkOption {
+      default = {};
+      type = extraTypes.rules;
+    };
+
+    extra6 = mkOption {
+      default = {};
+      type = extraTypes.rules;
     };
   };
 
@@ -112,6 +139,7 @@ let {
         "-o lo -p tcp -m tcp --dport 11423 -j REDIRECT --to-ports 22"
       ]}
       ${formatTable cfg.extra.nat}
+      ${formatTable cfg."extra${toString iptables-version}".nat}
       COMMIT
       *filter
       :INPUT DROP [0:0]
@@ -129,6 +157,7 @@ let {
         ++ ["-i retiolum -j Retiolum"]
       )}
       ${formatTable cfg.extra.filter}
+      ${formatTable cfg."extra${toString iptables-version}".filter}
       ${concatMapStringsSep "\n" (rule: "-A Retiolum ${rule}") ([]
         ++ optional (cfg.accept-echo-request == "retiolum") accept-echo-request
         ++ map accept-tcp (unique (map toString cfg.input-retiolum-accept-tcp))

From bc534f38aa3885d654175e747774dcbad243c08d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 10 Feb 2019 14:36:31 +0100
Subject: [PATCH 53/59] tv iptables extraTypes: add Retiolum

---
 tv/3modules/iptables.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index 3f1df9220..3974760d5 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -32,6 +32,10 @@ let {
           type = with types; listOf str;
           default = [];
         };
+        filter.Retiolum = mkOption {
+          type = with types; listOf str;
+          default = [];
+        };
       };
     };
   };

From 5605d675daf909f586957e1c735a9ff82e6ac68b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 12 Feb 2019 14:55:19 +0100
Subject: [PATCH 54/59] nixpkgs: b01a89d -> 168cbb3

---
 krebs/nixpkgs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 2fd2839b9..ecc45a15b 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "b01a89d58f117c485f16c97a388da6227d8f0103",
-  "date": "2019-02-08T10:50:49+01:00",
-  "sha256": "1s2jdfvqjviiiq897sd6fkmc8ffyca7agmxynp4w873rfjdz10yi",
+  "rev": "168cbb39691cca2822ce1fdb3e8c0183af5c6d0d",
+  "date": "2019-02-12T00:54:14+01:00",
+  "sha256": "0fqasswfqrz2rbag9bz17j8y7615s0p9l23cw4sk2f384gk0zf6c",
   "fetchSubmodules": false
 }

From 5845742ae0770bae3c341d2d7eacb4ccc05245c9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 16 Feb 2019 15:28:30 +0100
Subject: [PATCH 55/59] nixpkgs: 168cbb3 -> 9bd45dd

---
 krebs/nixpkgs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index ecc45a15b..b6124ad41 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "168cbb39691cca2822ce1fdb3e8c0183af5c6d0d",
-  "date": "2019-02-12T00:54:14+01:00",
-  "sha256": "0fqasswfqrz2rbag9bz17j8y7615s0p9l23cw4sk2f384gk0zf6c",
+  "rev": "9bd45dddf8171e2fd4288d684f4f70a2025ded19",
+  "date": "2019-02-15T12:11:24-05:00",
+  "sha256": "1idrxrymwqfsfysav3yl8lya1jhgg8xzgq9hy7dpdd63770vn8c1",
   "fetchSubmodules": false
 }

From 174b3ee6bef292d3270823006f806f847dc5a264 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 15:39:17 +0100
Subject: [PATCH 56/59] lib.warnOldVersion: init

---
 lib/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 347830e8c..75086f864 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -145,6 +145,11 @@ let
     in
       filter (x: x != []) ([acc.chunk] ++ acc.chunks);
 
+    warnOldVersion = oldName: newName:
+      if compareVersions oldName newName != -1 then
+        trace "Upstream `${oldName}' gets overridden by `${newName}'." newName
+      else
+        newName;
   };
 in
 

From c69c75f2c63b350615ec8026538c879b91b7a6ea Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 16:01:03 +0100
Subject: [PATCH 57/59] tv bash-fzf-history: use overrideDerivation

---
 tv/5pkgs/simple/bash-fzf-history.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index b603dedd9..88a8e9e4a 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -97,7 +97,6 @@ with import <stockholm/lib>;
     bind -s | ${pkgs.gnugrep}/bin/grep __fzf_ >&2
   '';
 in
-  script //
-  rec {
+  script.overrideAttrs (old: rec {
     bind = /* sh */ ''bind -x '"${load-keyseq}": . ${script}' '';
-  }
+  })

From 763a81ac08da6d20b0ea3bbd8423df3e64f934dc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 20 Mar 2015 10:36:12 +0100
Subject: [PATCH 58/59] lib.xml: init

---
 lib/default.nix |  1 +
 lib/xml.nix     | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 lib/xml.nix

diff --git a/lib/default.nix b/lib/default.nix
index 75086f864..8ba55b571 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -9,6 +9,7 @@ let
     krops = import ../submodules/krops/lib;
     shell = import ./shell.nix { inherit lib; };
     types = nixpkgs-lib.types // import ./types.nix { inherit lib; };
+    xml = import ./xml.nix { inherit lib; };
 
     eq = x: y: x == y;
     ne = x: y: x != y;
diff --git a/lib/xml.nix b/lib/xml.nix
new file mode 100644
index 000000000..92f552154
--- /dev/null
+++ b/lib/xml.nix
@@ -0,0 +1,84 @@
+{ lib }:
+with lib;
+with builtins;
+rec {
+
+  # Use `term` to construct XML.
+  #
+  # Examples:
+  #
+  #   (term "bool" null null)
+  #   (term "cool" null [])
+  #   (term "fool" { hurr = "durr"; } null)
+  #   (term "hool" null [
+  #     (term "tool" null null)
+  #   ])
+  #
+  # See `render` for how these get transformed into actuall XML documents.
+  #
+  term = name: attrs: content: {
+    inherit name attrs content;
+  };
+
+  empty = term null null null;
+
+  # Ref http://www.w3.org/TR/xml/#syntax
+  #
+  # Example:
+  #
+  #   (quote "<cheez!>")                 #===>   &lt;cheez!&gt;
+  #
+  quote = let
+    sub = {
+      "&" = "&amp;";
+      "<" = "&lt;";
+      ">" = "&gt;";
+      "'" = "&apos;";
+      "\"" = "&quot;";
+    };
+  in
+    stringAsChars (c: sub.${c} or c);
+
+  # Turn an XML element to an XML document string.
+  doc = t:
+    "<?xml version='1.0' encoding='UTF-8'?>${render t}";
+
+  # Render an XML element to a string.
+  #
+  # Rendering `empty` yields the empty string.
+  #
+  # Examples:
+  #
+  #   (term "bool" null null)                 #===>   <bool/>
+  #   (term "cool" null [])                   #===>   <cool></cool>
+  #   (term "fool" { hurr = "durr"; } null)   #===>   <fool hurr="durr"/>
+  #   (term "hool" null [
+  #     (term "tool" null null)
+  #   ])                                      #===>   <hool><tool/></hool>
+  #
+  render = let
+    render-attrs = attrs:
+      getAttr (typeOf attrs) {
+        null = "";
+        set = concatStrings (mapAttrsToList (n: v: " ${n}=\"${v}\"") attrs);
+      };
+
+    render-content = content:
+      getAttr (typeOf content) {
+        bool = toJSON content;
+        int = toJSON content;
+        list = concatMapStrings render content;
+        string = content;
+      };
+  in
+    { name, attrs, content }:
+    if name == null
+      then ""
+      else let
+        attrs' = render-attrs attrs;
+        content' = render-content content;
+      in
+        if content == null
+          then "<${name}${attrs'}/>"
+          else "<${name}${attrs'}>${content'}</${name}>";
+}

From 270ceb7676e867c9dff5f5faa765666b58aaa371 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 20 Mar 2015 10:58:11 +0100
Subject: [PATCH 59/59] lib.xml.render-term: quote strings

---
 lib/xml.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/xml.nix b/lib/xml.nix
index 92f552154..16052445b 100644
--- a/lib/xml.nix
+++ b/lib/xml.nix
@@ -68,12 +68,16 @@ rec {
         bool = toJSON content;
         int = toJSON content;
         list = concatMapStrings render content;
-        string = content;
+        string = quote content;
       };
   in
     { name, attrs, content }:
+    # XXX we're currently encoding too much information with `null`..
     if name == null
-      then ""
+      then
+        if content == null
+          then ""
+          else content
       else let
         attrs' = render-attrs attrs;
         content' = render-content content;