From f113b93aa8416b74cf6d2796913147893cc78e49 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 25 Jun 2017 16:15:18 +0200
Subject: tv: properly use symlinkJoin paths

Because earlier entries override later ones.
---
 tv/2configs/htop.nix | 2 +-
 tv/2configs/vim.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tv/2configs/htop.nix b/tv/2configs/htop.nix
index 5d7e0272b..d7d2d7bfd 100644
--- a/tv/2configs/htop.nix
+++ b/tv/2configs/htop.nix
@@ -7,7 +7,6 @@ with import <stockholm/lib>;
     htop = pkgs.symlinkJoin {
       name = "htop";
       paths = [
-        super.htop
         (pkgs.writeDashBin "htop" ''
           export HTOPRC=${pkgs.writeText "htoprc" ''
             fields=0 48 17 18 38 39 40 2 46 47 49 1
@@ -37,6 +36,7 @@ with import <stockholm/lib>;
           ''}
           exec ${super.htop}/bin/htop "$@"
         '')
+        super.htop
       ];
     };
   };
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 93ed46dc8..a3af93772 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -300,7 +300,6 @@ let {
   vim-wrapper = pkgs.symlinkJoin {
     name = "vim";
     paths = [
-      pkgs.vim_configurable
       (pkgs.writeDashBin "vim" ''
         set -efu
         (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
@@ -310,6 +309,7 @@ let {
         # vim-orgmode needs Python, thus vim_configurable instead of just vim
         exec ${pkgs.vim_configurable}/bin/vim "$@"
       '')
+      pkgs.vim_configurable
     ];
   };
 
-- 
cgit v1.2.3


From 74429f245d366e783ecbcfb0ebd83a7f57e78e6a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 10:01:16 +0200
Subject: tv: add htop to default systemPackages

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

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 108006f34..9f2cec574 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -25,7 +25,6 @@ with import <stockholm/lib>;
   };
 
   environment.systemPackages = with pkgs; [
-    htop
     iftop
     iotop
     iptables
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 60f9fa100..4b3bf8538 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -31,7 +31,6 @@ with import <stockholm/lib>;
         get
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         mkpasswd
         netcat
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 3add01748..d82f45ac0 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -34,7 +34,6 @@ with import <stockholm/lib>;
         file
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         krebszones
         mkpasswd
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index 5552ef065..4fae3ca75 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -36,7 +36,6 @@ with import <stockholm/lib>;
         file
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         mkpasswd
         netcat
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4a1247ef5..d248bf578 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -158,9 +158,10 @@ with import <stockholm/lib>;
     {
       environment.systemPackages = [
         pkgs.get
+        pkgs.htop
         pkgs.krebspaste
-        pkgs.ovh-zone
         pkgs.nix-prefetch-scripts
+        pkgs.ovh-zone
         pkgs.push
       ];
     }
-- 
cgit v1.2.3


From 0e607fe1bc50b596301086b064a74232d7126f5c Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 27 Jun 2017 19:46:56 +0200
Subject: l nixpkgs: 4847963 -> e84de79

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

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 2adba34bb..34f0a064b 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "4847963";
+    ref = "e84de79";
   };
 }
-- 
cgit v1.2.3


From 3789c7698b4e076d907e31ab8c0ba60597ee3721 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 19:55:49 +0200
Subject: tv alnus nixpkgs: e924319 -> 9b948ea

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

diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix
index 4bc0318e8..ef2a0500f 100644
--- a/tv/1systems/alnus.nix
+++ b/tv/1systems/alnus.nix
@@ -58,7 +58,7 @@ with import <stockholm/lib>;
   krebs.build = {
     host = config.krebs.hosts.alnus;
     user = mkForce config.krebs.users.dv;
-    source.nixpkgs.git.ref = mkForce "e924319cb6c74aa2a9c943eddeb0caef79db01bc";
+    source.nixpkgs.git.ref = mkForce "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
   };
 
   networking.networkmanager.enable = true;
-- 
cgit v1.2.3


From b836a43a395e0f2860b3243702caf53c53a6664a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 18 Jun 2017 23:23:28 +0200
Subject: m 2 dirctator: bump to latest logstash5

---
 makefu/2configs/deployment/dirctator.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/makefu/2configs/deployment/dirctator.nix b/makefu/2configs/deployment/dirctator.nix
index b8e61955d..4f2f8818d 100644
--- a/makefu/2configs/deployment/dirctator.nix
+++ b/makefu/2configs/deployment/dirctator.nix
@@ -25,6 +25,10 @@ in {
       stdout { codec => rubydebug }
       exec { command => "${runit} '%{message}" }
     '';
-    plugins = [ ];
+    extraSettings = ''
+      path.plugins: [ "${pkgs.logstash-output-exec}" ]
+    '';
+    ## NameError: `@path.plugins' is not allowable as an instance variable name
+    # plugins = [ pkgs.logstash-output-exec ];
   };
 }
-- 
cgit v1.2.3


From 8c5cc416ace4bf4a251c878ad660e3a043bdb0ab Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 15:32:38 +0200
Subject: doc: init Commit Messages Guideline

Based on the discussion irc://ni.r/#retiolum at 2017-06-26
---
 doc/Commit_Messages_Guideline.md | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 doc/Commit_Messages_Guideline.md

diff --git a/doc/Commit_Messages_Guideline.md b/doc/Commit_Messages_Guideline.md
new file mode 100644
index 000000000..e704ee575
--- /dev/null
+++ b/doc/Commit_Messages_Guideline.md
@@ -0,0 +1,53 @@
+# Commit Messages Guideline
+
+Commits SHOULD have the following format:
+
+```
+<namespace?> <component>: <change>
+
+<rationale>
+
+(<reference-name>: <reference-id>)?
+```
+
+## `<namespace>`
+Defines where the change took place. This can be omitted if the
+namespace is `krebs`. Namespaces may be shortened to one to four characters (
+lassulus -> lass, makefu -> make, tv -> tv, shared -> sha)
+
+## `<component>`
+Name of the component which was touched. `component` is
+rather fuzzy and may mean different things, just choose what would fit best.
+
+Here are a numbers of samples for defining the component:
+
+* Change `gum` in `krebs/3modules/makefu/default.nix`: `gum.r: change ip`
+* Change `prepare.sh` in `krebs/4libs/infest`: `infest: prepare stockholm ISO`
+* Remove `concat` in `krebs/5pkgs`: `concat: RIP`, this commit may like some `<rationale>`
+* Update `types` in `krebs/3modules`: `lib/types: add managed bool to host type`
+* Change host `gum` in `makefu/1systems/gum`: `ma gum.r: add taskserver`
+* Change `tinc` module in `krebs/3modules`: `tinc module: add option enableLegacy`
+
+## `<rationale>`
+Describe some trivia why the commit was done:
+```
+whatsupnix: init
+
+Import from https://github.com/NixOS/nix/issues/443#issuecomment-296752535
+```
+
+## `<reference>`
+Defines external resouces related to the commit:
+```
+Closes: #123533
+CVE: CVE-2016-00001
+URL: https://example.com/CVE-2016-00001
+```
+
+## Remarks
+As a general rule of thumb you can check out: https://www.slideshare.net/TarinGamberini/commit-messages-goodpractices
+Of course the pattern not always fits perfectly (for example for refactoring),
+just apply some common sense and define a useful commit message,
+like `refactor krebs.setuid`.
+
+
-- 
cgit v1.2.3


From d8f6c52b76feaeac9240a9749f2b38c19f155b9e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:00:37 +0200
Subject: ma hw: refactor

---
 makefu/2configs/hw/exfat-nofuse.nix | 4 ++++
 makefu/2configs/hw/stk1160.nix      | 3 +--
 makefu/2configs/hw/wwan.nix         | 8 ++++++++
 makefu/2configs/wwan.nix            | 8 --------
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 makefu/2configs/hw/exfat-nofuse.nix
 create mode 100644 makefu/2configs/hw/wwan.nix
 delete mode 100644 makefu/2configs/wwan.nix

diff --git a/makefu/2configs/hw/exfat-nofuse.nix b/makefu/2configs/hw/exfat-nofuse.nix
new file mode 100644
index 000000000..ca3485e9f
--- /dev/null
+++ b/makefu/2configs/hw/exfat-nofuse.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
+}
diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix
index b4d033d76..e73741e26 100644
--- a/makefu/2configs/hw/stk1160.nix
+++ b/makefu/2configs/hw/stk1160.nix
@@ -1,9 +1,8 @@
 { pkgs, ... }:
 {
   # TODO: un-pin linuxPackages somehow
-  boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages_4_9;
   nixpkgs.config.packageOverrides = pkgs: {
-    linux_4_9 = pkgs.linux_4_9.override {
+    linux_latest = pkgs.linux_latest.override {
         extraConfig = ''
           MEDIA_ANALOG_TV_SUPPORT y
           VIDEO_STK1160_COMMON m
diff --git a/makefu/2configs/hw/wwan.nix b/makefu/2configs/hw/wwan.nix
new file mode 100644
index 000000000..0eb0c97d7
--- /dev/null
+++ b/makefu/2configs/hw/wwan.nix
@@ -0,0 +1,8 @@
+_:
+
+{
+  makefu.umts = {
+    enable = true;
+    modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01";
+  };
+}
diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix
deleted file mode 100644
index 0eb0c97d7..000000000
--- a/makefu/2configs/wwan.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-_:
-
-{
-  makefu.umts = {
-    enable = true;
-    modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01";
-  };
-}
-- 
cgit v1.2.3


From 0b88f7d2fee456eb0a5c8ec426e5d6f5d7d2e1f3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:00:54 +0200
Subject: ma x.r: cleanup imports

---
 makefu/1systems/x.nix | 49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index ee3a7bb1b..77b9915ae 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -13,59 +13,48 @@ with import <stockholm/lib>;
       ../2configs/tools/all.nix
       ../2configs/laptop-backup.nix
       ../2configs/dnscrypt.nix
+      ../2configs/avahi.nix
 
-      # testing
-      # ../2configs/openvpn/vpngate.nix
-      #../2configs/temp/share-samba.nix
-      # ../2configs/mediawiki.nix
-      # ../2configs/wordpress.nix
-      # ../2configs/nginx/public_html.nix
-      # ../2configs/nginx/icecult.nix
-
-      # ../2configs/elchos/irc-token.nix
-      # ../2configs/elchos/log.nix
-
-      #../2configs/elchos/search.nix
-      #../2configs/elchos/stats.nix
-      #../2configs/elchos/test/ftpservers.nix
-
-      # ../2configs/tinc/siem.nix
-      #../2configs/torrent.nix
-      # temporary modules
-
-      # ../2configs/torrent.nix
-      #../2configs/temp/elkstack.nix
-      # ../2configs/temp/sabnzbd.nix
+      # Debugging
+      # ../2configs/disable_v6.nix
 
+      # Testing
+      # ../2configs/deployment/dirctator.nix
+      # ../2configs/vncserver.nix
+      # ../2configs/deployment/led-fader
+      # ../2configs/deployment/hound
 
       # development
       ../2configs/sources
 
       # Krebs
-      # ../2configs/disable_v6.nix
       ../2configs/tinc/retiolum.nix
 
       # applications
       ../2configs/exim-retiolum.nix
       ../2configs/mail-client.nix
       ../2configs/printer.nix
+
+      # Virtualization
       ../2configs/virtualization.nix
+      ../2configs/docker.nix
       ../2configs/virtualization-virtualbox.nix
-      ../2configs/wwan.nix
-      ../2configs/rad1o.nix
 
-      # services
+      # Services
       ../2configs/git/brain-retiolum.nix
       ../2configs/tor.nix
       ../2configs/steam.nix
       # ../2configs/buildbot-standalone.nix
 
-      # hardware specifics are in here
+      # Hardware
       ../2configs/hw/tp-x230.nix
       ../2configs/hw/rtl8812au.nix
-      ../2configs/hw/stk1160.nix
+      ../2configs/hw/exfat-nofuse.nix
+      ../2configs/hw/wwan.nix
+      # ../2configs/hw/stk1160.nix
+      # ../2configs/rad1o.nix
 
-      # mount points
+      # Filesystem
       ../2configs/fs/sda-crypto-root-home.nix
 
     ];
@@ -76,10 +65,8 @@ with import <stockholm/lib>;
 
   nixpkgs.config.allowUnfree = true;
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
   environment.systemPackages = [ pkgs.passwdqc-utils ];
 
-  virtualisation.docker.enable = true;
 
   # configure pulseAudio to provide a HDMI sink as well
   networking.firewall.enable = true;
-- 
cgit v1.2.3


From 02eeb5a550728213c0777ccb1a5b2392f8fef18a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:01:36 +0200
Subject: ma tools: add more software

---
 makefu/2configs/tools/dev.nix       | 2 ++
 makefu/2configs/tools/extra-gui.nix | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 4fe7f8bf4..e40f5b36f 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -12,5 +12,7 @@
     cac-api
     cac-panel
     ovh-zone
+    whatsupnix
+    brain
   ];
 }
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 56cdccd1f..1e68e935c 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -2,13 +2,16 @@
 
 {
   krebs.per-user.makefu.packages = with pkgs;[
+    # media
     gimp
     inkscape
     libreoffice
-    saleae-logic
     skype
     synergy
     tdesktop
     virtmanager
+    # Dev
+    saleae-logic
+    arduino-user-env
   ];
 }
-- 
cgit v1.2.3


From 4221210d5a495f9033d9e566b6f926d3fcc9aec5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:01:50 +0200
Subject: ma docker: init config

---
 makefu/2configs/docker.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 makefu/2configs/docker.nix

diff --git a/makefu/2configs/docker.nix b/makefu/2configs/docker.nix
new file mode 100644
index 000000000..98fd980cc
--- /dev/null
+++ b/makefu/2configs/docker.nix
@@ -0,0 +1,4 @@
+{...}:
+{
+  virtualisation.docker.enable = true;
+}
-- 
cgit v1.2.3


From 319add434302276a52590f1bca3701ee45443cc5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:08:27 +0200
Subject: doc/makefu: init logbook

add the logbooks i created for install_fileleech and transfer of gum
---
 doc/makefu/logbook/install_fileleech.md | 17 +++++++++++++++++
 doc/makefu/logbook/transfer_gum.md      | 16 ++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 doc/makefu/logbook/install_fileleech.md
 create mode 100644 doc/makefu/logbook/transfer_gum.md

diff --git a/doc/makefu/logbook/install_fileleech.md b/doc/makefu/logbook/install_fileleech.md
new file mode 100644
index 000000000..15f8c1bca
--- /dev/null
+++ b/doc/makefu/logbook/install_fileleech.md
@@ -0,0 +1,17 @@
+# install fileleech
+
+```
+builder$ python3 host.py --create-ssh-keys --create-passwords fileleech
+iso$ fdisk /dev/sda # 3 partitions, grub,boot,crypt
+iso$ cryptsetup luksFormat /dev/sda3 --cipher aes-xts-plain64 -s 512 -h sha512
+iso$ cryptsetup luksAddKey /dev/sda3 hddkey
+iso$ cryptsetup luksOpen --keyfile-size=4096  -d /dev/disk/by-id/usb-Intuix_DiskOnKey_09A07360336198F8-0:0 /dev/disk/by-id/ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN-part3 luksroot
+iso$ mkfs.ext4 -Lnixboot /dev/sda2
+iso$ mkfs.ext4 -Lroot /dev/mapper/luksroot
+iso$ echo 1 > /proc/sys/net/ipv6/conf/enp8s0f0/disable_ipv6
+iso$ mount /dev/mapper/luksroot /mnt
+iso$ mkdir /mnt/boot
+iso$ mount /dev/sda2 /mnt/boot
+iso$ mkdir -p /mnt/var/src
+iso$ touch /mnt/var/src/.populate
+```
diff --git a/doc/makefu/logbook/transfer_gum.md b/doc/makefu/logbook/transfer_gum.md
new file mode 100644
index 000000000..5f9c88256
--- /dev/null
+++ b/doc/makefu/logbook/transfer_gum.md
@@ -0,0 +1,16 @@
+# transfer gum to new hosts
+
+```
+builder$ vim krebs/3modules/makefu/default.nix
+## update ip
+builder$ vim makefu/1systems/gum.nix
+## update hardware config
+
+old-gum$ rsync --progress -lprtvzF  . <newip>:/mnt/
+
+new-gum$ touch /mnt/var/src/.populate
+new-gum$ gdisk /dev/sda r;g;w # gpt to mbr
+
+builder$ make -C ~/stockholm system=gum target=vcygfnhdxyxr47zu.onion install
+
+```
-- 
cgit v1.2.3


From 622d0dc0f266f94cfd5e6a5eec0ae254fec60ba3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:22:47 +0200
Subject: ma task-client: systemPackages -> per-user

---
 makefu/2configs/task-client.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 makefu/2configs/task-client.nix

diff --git a/makefu/2configs/task-client.nix b/makefu/2configs/task-client.nix
new file mode 100644
index 000000000..330616f4a
--- /dev/null
+++ b/makefu/2configs/task-client.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  krebs.per-user.makefu.packages = [
+    pkgs.taskwarrior
+  ];
+
+  environment.shellAliases = {
+    tshack = "task project:shack";
+    twork = "task project:soc";
+    tpki = "task project:pki";
+    tkrebs = "task project:krebs";
+    t = "task project: ";
+  };
+}
-- 
cgit v1.2.3


From 1f72a5d66bbbc9f213e3fa5de071d06a1818d930 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 17:06:22 +0200
Subject: ma arduino-user-env: init

---
 makefu/5pkgs/arduino-user-env/default.nix | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 makefu/5pkgs/arduino-user-env/default.nix

diff --git a/makefu/5pkgs/arduino-user-env/default.nix b/makefu/5pkgs/arduino-user-env/default.nix
new file mode 100644
index 000000000..7339c50a2
--- /dev/null
+++ b/makefu/5pkgs/arduino-user-env/default.nix
@@ -0,0 +1,35 @@
+{ lib, pkgs, ... }: let
+
+#TODO: make sure env exists prior to running
+env_nix = pkgs.writeText "env.nix" ''
+  { pkgs ? import <nixpkgs> {} }:
+
+  (pkgs.buildFHSUserEnv {
+    name = "arduino-user-env";
+    targetPkgs = pkgs: with pkgs; [
+      coreutils
+    ];
+    multiPkgs = pkgs: with pkgs; [
+      arduino
+      alsaLib
+      zlib
+      xorg.libXxf86vm
+      curl
+      openal
+      openssl_1_0_2
+      xorg.libXext
+      xorg.libX11
+      xorg.libXrandr
+      xorg.libXcursor
+      xorg.libXinerama
+      xorg.libXi
+      mesa_glu
+    ];
+    runScript = "zsh";
+  }).env
+'';
+
+
+in pkgs.writeDashBin "arduino-user-env" ''
+  nix-shell ${env_nix}
+''
-- 
cgit v1.2.3


From d58e8035b4101b20539279247ec083b72ba0a647 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 14:22:11 +0200
Subject: k 4 infest: prepare Regression for stockholm

---
 krebs/4lib/infest/prepare.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index 50d521e17..8e921ce06 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -36,14 +36,7 @@ prepare() {(
             ;;
         esac
         ;;
-      nixos)
-        case $(cat /proc/cmdline) in
-          *' root=LABEL=NIXOS_ISO '*)
-            prepare_nixos_iso "$@"
-            exit
-        esac
-        ;;
-      stockholm)
+      nixos|stockholm)
         case $(cat /proc/cmdline) in
           *' root=LABEL=NIXOS_ISO '*)
             prepare_nixos_iso "$@"
@@ -102,7 +95,8 @@ prepare_nixos_iso() {
   mkdir -p bin
   rm -f bin/nixos-install
   cp "$(type -p nixos-install)" bin/nixos-install
-  sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
+  sed -i 's@^\(\(export \|\)NIX_PATH\)=\"[^\"]*\"@\1=$target_path@' bin/nixos-install
+
 }
 
 get_nixos_install() {
@@ -217,7 +211,7 @@ prepare_common() {(
   mkdir -p bin
   rm -f bin/nixos-install
   cp "$(type -p nixos-install)" bin/nixos-install
-  sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
+  sed -i 's@^\(\(export \|\)NIX_PATH\)=\"[^\"]*\"@\1=$target_path@' bin/nixos-install
 
   if ! grep -q '^PATH.*#krebs' .bashrc; then
     echo '. /root/.nix-profile/etc/profile.d/nix.sh' >> .bashrc
-- 
cgit v1.2.3


From 1b2a4d09ed9e30c6874697ca9421087a5573a0ad Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 27 Jun 2017 20:59:02 +0200
Subject: l nixpkgs: e84de79 -> 0a4db15

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

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 34f0a064b..1c68d58d5 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "e84de79";
+    ref = "0a4db15";
   };
 }
-- 
cgit v1.2.3


From b28b68250d13bfa15b6cc58e597873737e616e93 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Jun 2017 21:01:40 +0200
Subject: make x.r: init lancache

prepare deployment of lan party steam cache
---
 makefu/1systems/x.nix        |  1 +
 makefu/2configs/lancache.nix | 79 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 makefu/2configs/lancache.nix

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 77b9915ae..b37c32944 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -34,6 +34,7 @@ with import <stockholm/lib>;
       ../2configs/exim-retiolum.nix
       ../2configs/mail-client.nix
       ../2configs/printer.nix
+      ../2configs/task-client.nix
 
       # Virtualization
       ../2configs/virtualization.nix
diff --git a/makefu/2configs/lancache.nix b/makefu/2configs/lancache.nix
new file mode 100644
index 000000000..8ec401361
--- /dev/null
+++ b/makefu/2configs/lancache.nix
@@ -0,0 +1,79 @@
+{ pkgs, lib, config, ... }:
+with import <stockholm/lib>;
+let
+  # see https://github.com/zeropingheroes/lancache for full docs
+  cachedir = "/var/lancache/cache";
+  logdir = "/var/lancache/log";
+
+  lancache= pkgs.stdenv.mkDerivation rec {
+    name = "lancache-2017-06-26";
+    src = pkgs.fetchFromGitHub {
+      # origin: https://github.com/multiplay/lancache
+      # forked: https://github.com/zeropingheroes/lancache
+      repo = "lancache";
+      owner = "zeropingheroes";
+      rev = "143f7bb";
+      sha256 = "1ra4l7qz3k231j5wabr89s5hh80n1kk8vgd3dsh0xx5mdpjhvdl6";
+    };
+    phases = [ "unpackPhase" "installPhase" ];
+    # here we can chance to edit `includes/proxy-cache-paths.conf`
+    installPhase = ''
+      mkdir -p $out
+      cp -r * $out/
+      sed -i -e 's/^\(user\).*/\1 ${cfg.user} ${cfg.group};/' \
+             -e 's/^\(error_log\).*/\1 stderr;\ndaemon off;/' $out/nginx.conf
+    '';
+  };
+  cfg = {
+    group = "nginx-lancache";
+    user = "nginx-lancache";
+    stateDir = "/var/lancache";
+    package = pkgs.stdenv.lib.overrideDerivation pkgs.nginx (old:{
+      configureFlags = old.configureFlags ++ [
+        "--with-http_slice_module"
+        "--with-stream"
+        "--with-pcre"
+        ];
+    });
+  };
+in {
+  systemd.services.nginx-lancache = {
+      description = "Nginx lancache Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      restartIfChanged = true;
+
+      preStart = ''
+				PATH_CACHE="/var/lancache/cache"
+				PATH_LOGS="/var/lancache/logs"
+				WWW_USER="${cfg.user}"
+				WWW_GROUP="${cfg.group}"
+
+				mkdir -p $PATH_CACHE
+				cd $PATH_CACHE
+				mkdir -p installers tmp
+				mkdir -p $PATH_LOGS
+
+				chown -R $WWW_USER:$WWW_USER $PATH_CACHE
+				chown -R $WWW_USER:$WWW_USER $PATH_LOGS
+        '';
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/nginx -c ${lancache}/nginx.conf -p ${lancache}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "always";
+        RestartSec = "10s";
+        StartLimitInterval = "1min";
+      };
+    };
+      users.extraUsers = (singleton
+    { name = cfg.user;
+      group = cfg.group;
+      uid = genid cfg.group;
+    });
+
+    users.extraGroups = (singleton
+      { name = "${cfg.group}";
+        gid = genid cfg.group;
+    });
+
+}
-- 
cgit v1.2.3


From dca58fbc212468cb97e15ac1fc2f47a1693c7ff3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Jun 2017 21:02:36 +0200
Subject: make led-fader: after networ-online.target

---
 makefu/2configs/deployment/led-fader.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/makefu/2configs/deployment/led-fader.nix b/makefu/2configs/deployment/led-fader.nix
index 50023693d..678370c69 100644
--- a/makefu/2configs/deployment/led-fader.nix
+++ b/makefu/2configs/deployment/led-fader.nix
@@ -31,6 +31,7 @@ in {
     };
     # after = [ (lib.optional config.services.mosqitto.enable "mosquitto.service") ];
     wantedBy = [ "multi-user.target"  ];
+    after = [ "network-online.target"  ];
     serviceConfig = {
       # User = "nobody"; # need a user with permissions to run nix-shell
       ExecStart = "${pkg}/bin/ampel 4 ${pkg}/share/times.json";
-- 
cgit v1.2.3


From ebb68ee1f89d9387402effe0726809831e6de9b6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 21:30:05 +0200
Subject: tv mu: security.wrappers.slock.{slock => source}

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

diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index fcd0a2178..cb8e7d97a 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -101,7 +101,7 @@ with import <stockholm/lib>;
 
   security.wrappers = {
     sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
-    slock.slock = "${pkgs.slock}/bin/slock";
+    slock.source = "${pkgs.slock}/bin/slock";
   };
 
   security.pam.loginLimits = [
-- 
cgit v1.2.3


From 24adece79e47af6602ce1fc48a2d5b772c225b61 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 21:30:22 +0200
Subject: tv mu: kde4 -> plasma5, maybe

---
 tv/1systems/mu.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index cb8e7d97a..8e527b021 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -82,12 +82,9 @@ with import <stockholm/lib>;
     chromiumDev
     skype
     libreoffice
-    kde4.l10n.de
-    kde4.plasma-nm
     pidgin-with-plugins
     pidginotr
 
-    kde4.print_manager
     #foomatic_filters
     #gutenprint
     #cups_pdf_filter
@@ -138,7 +135,9 @@ with import <stockholm/lib>;
     twoFingerScroll = true;
   };
 
-  services.xserver.desktopManager.kde4.enable = true;
+  services.xserver.desktopManager.plasma5 = {
+    enable = true;
+  };
   services.xserver.displayManager.auto = {
     enable = true;
     user = "vv";
-- 
cgit v1.2.3


From 4fc9f53f7a44a52fafc4ba7e7d3bf8e3dd865dd5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 22:29:46 +0200
Subject: tv mu: chromiumDev -> chromium

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

diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index 8e527b021..3f3b2c2f4 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -79,7 +79,7 @@ with import <stockholm/lib>;
     gimp
     xsane
     firefoxWrapper
-    chromiumDev
+    chromium
     skype
     libreoffice
     pidgin-with-plugins
-- 
cgit v1.2.3


From 954996f78fbd65f89d2e768d09e2bcc41c080d17 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 22:57:34 +0200
Subject: tv: configure stockholm for buildbot

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

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index d248bf578..5d61cb941 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,20 +1,24 @@
-{ config, lib, pkgs, ... }:
-
 with import <stockholm/lib>;
-
-{
+{ config, lib, pkgs, ... }: let
+  builder = if getEnv "dummy_secrets" == "true"
+              then "buildbot"
+              else "tv";
+in {
   krebs.enable = true;
 
   krebs.build = {
     user = config.krebs.users.tv;
     source = let inherit (config.krebs.build) host; in {
       nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix";
-      secrets.file =
-        if getEnv "dummy_secrets" == "true"
-          then toString <stockholm/tv/dummy_secrets>
-          else "/home/tv/secrets/${host.name}";
+      secrets.file = getAttr builder {
+        buildbot = toString <stockholm/tv/dummy_secrets>;
+        tv = "/home/tv/secrets/${host.name}";
+      };
       secrets-common.file = "/home/tv/secrets/common";
-      stockholm.file = "/home/tv/stockholm";
+      stockholm.file = getAttr builder {
+        buildbot = getEnv "PWD";
+        tv = "/home/tv/stockholm";
+      };
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
-- 
cgit v1.2.3


From 62638ad7f17a4ed536a1842e36130c264d1e2bc2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 23:28:41 +0200
Subject: Makefile: call build with whatsupnix

---
 Makefile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ce6205c5b..ecc2f493d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,23 @@ $(if $(target_user),,$(error unbound variable: target_user))
 $(if $(target_port),,$(error unbound variable: target_port))
 $(if $(target_path),,$(error unbound variable: target_path))
 
+whatsupnix = \
+	if type whatsupnix >/dev/null 2>&1; then \
+	  whatsupnix $(1); \
+	else \
+	  cat; \
+	fi
+
 build = \
 	nix-build \
+		-Q \
 		--no-out-link \
 		--show-trace \
 		-I nixos-config=$(nixos-config) \
 		-I stockholm=$(stockholm) \
-		-E "with import <stockholm>; $(1)"
+		-E "with import <stockholm>; $(1)" \
+		$(2) \
+	|& $(call whatsupnix)
 
 evaluate = \
 	nix-instantiate \
@@ -84,11 +94,7 @@ deploy:
 	$(ssh) $(target_user)@$(target_host) -p $(target_port) \
 		env STOCKHOLM_VERSION="$$STOCKHOLM_VERSION" \
 			nixos-rebuild -Q $(rebuild-command) --show-trace -I $(target_path) \
-		|& if type whatsupnix 2>/dev/null; then \
-		     whatsupnix $(target_user)@$(target_host):$(target_port); \
-		   else \
-		     cat; \
-		   fi
+	|& $(call whatsupnix,$(target_user)@$(target_host):$(target_port))
 
 # usage: make populate system=foo
 populate: populate-target = \
-- 
cgit v1.2.3


From f61a6d03e3ad27b18fcf96f586717ba99c588c4a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 23:29:43 +0200
Subject: make test: use build and evaluate

---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ecc2f493d..cab53d52a 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,8 @@ evaluate = \
 		--show-trace \
 		-I nixos-config=$(nixos-config) \
 		-I stockholm=$(stockholm) \
-		-E "let eval = import <stockholm>; in with eval; $(1)"
+		-E "let eval = import <stockholm>; in with eval; $(1)" \
+		$(2)
 
 ifeq ($(MAKECMDGOALS),)
 $(error No goals specified)
@@ -132,10 +133,10 @@ install:
 # usage: make test system=foo [target=bar] [method={eval,build}]
 method ?= eval
 ifeq ($(method),build)
-test: command = nix-build --no-out-link
+test: test = $(call build,$(1),$(2))
 else
 ifeq ($(method),eval)
-test: command ?= nix-instantiate --eval --json --readonly-mode --strict
+test: test ?= $(call evaluate,$(1),$(2)) --json --strict | jq -r .
 else
 $(error bad method: $(method))
 endif
@@ -147,6 +148,4 @@ else
 test: wrapper = $(ssh) $(target_user)@$(target_host) -p $(target_port)
 endif
 test: populate
-	$(wrapper) \
-		$(command) --show-trace -I $(target_path) \
-			-A config.system.build.toplevel $(target_path)/stockholm
+	$(wrapper) $(call test,config.system.build.toplevel,-I $(target_path))
-- 
cgit v1.2.3


From ee08824427c0a8dbc92aa2858300f7aae5d70df0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 23:40:38 +0200
Subject: tv: stockholm is really just <stockholm>

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

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 5d61cb941..aae7c5a1b 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,10 +15,7 @@ in {
         tv = "/home/tv/secrets/${host.name}";
       };
       secrets-common.file = "/home/tv/secrets/common";
-      stockholm.file = getAttr builder {
-        buildbot = getEnv "PWD";
-        tv = "/home/tv/stockholm";
-      };
+      stockholm.file = toString <stockholm>;
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
-- 
cgit v1.2.3


From 62e50105badbe23a3e448d8ca9f5770f7698b22b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 23:48:05 +0200
Subject: krebs.build.source: stockholm default is <stockholm>

---
 krebs/3modules/build.nix | 2 ++
 tv/2configs/default.nix  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 51f192703..976d378f9 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -24,4 +24,6 @@ with import <stockholm/lib>;
       type = types.user;
     };
   };
+
+  config.krebs.build.source.stockholm.file = mkDefault (toString <stockholm>);
 }
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index aae7c5a1b..bab1c72b6 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,7 +15,6 @@ in {
         tv = "/home/tv/secrets/${host.name}";
       };
       secrets-common.file = "/home/tv/secrets/common";
-      stockholm.file = toString <stockholm>;
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
-- 
cgit v1.2.3


From 10adb2d27e3005c7239585eb38dbbe3b5b01a400 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 28 Jun 2017 03:31:14 +0200
Subject: whatsupnix: use gawk and nix-store explicitly

---
 krebs/5pkgs/simple/whatsupnix/whatsupnix.bash | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
index 042763048..127209570 100644
--- a/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
+++ b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
@@ -17,15 +17,12 @@
 #   2     Build error; at least one failed derivation could be found.
 #
 
-GAWK=${GAWK:-gawk}
-NIX_STORE=${NIX_STORE:-nix-store}
-
 failed_drvs=$(mktemp --tmpdir whatsupnix.XXXXXXXX)
 trap 'rm -f -- "$failed_drvs"' EXIT
 
 exec >&2
 
-$GAWK -v failed_drvs="$failed_drvs" '
+gawk -v failed_drvs="$failed_drvs" '
   match($0, /^builder for ‘(\/nix\/store\/[^’]+\.drv)’ failed/, m) {
     print m[1] >> failed_drvs
   }
@@ -35,7 +32,7 @@ $GAWK -v failed_drvs="$failed_drvs" '
 case $# in
   0)
     print_log() {
-      NIX_PAGER= $NIX_STORE -l "$1"
+      NIX_PAGER= nix-store -l "$1"
     }
     ;;
   1)
-- 
cgit v1.2.3


From 9bd7f9ebf4055534ace98002a1a9ddbb243805d1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Jun 2017 08:46:55 +0200
Subject: ma lancache: fix nginx prefix issues

nginx is unable to have a config with relativ paths and a statedir
somewhere else. this is why i now prepare the 'prefix'
with everything in it.
---
 makefu/2configs/lancache.nix | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/makefu/2configs/lancache.nix b/makefu/2configs/lancache.nix
index 8ec401361..ff5b0d788 100644
--- a/makefu/2configs/lancache.nix
+++ b/makefu/2configs/lancache.nix
@@ -2,9 +2,6 @@
 with import <stockholm/lib>;
 let
   # see https://github.com/zeropingheroes/lancache for full docs
-  cachedir = "/var/lancache/cache";
-  logdir = "/var/lancache/log";
-
   lancache= pkgs.stdenv.mkDerivation rec {
     name = "lancache-2017-06-26";
     src = pkgs.fetchFromGitHub {
@@ -21,13 +18,14 @@ let
       mkdir -p $out
       cp -r * $out/
       sed -i -e 's/^\(user\).*/\1 ${cfg.user} ${cfg.group};/' \
-             -e 's/^\(error_log\).*/\1 stderr;\ndaemon off;/' $out/nginx.conf
+             -e '1 idaemon off;' \
+              $out/nginx.conf
     '';
   };
   cfg = {
     group = "nginx-lancache";
     user = "nginx-lancache";
-    stateDir = "/var/lancache";
+    statedir = "/var/lancache";
     package = pkgs.stdenv.lib.overrideDerivation pkgs.nginx (old:{
       configureFlags = old.configureFlags ++ [
         "--with-http_slice_module"
@@ -44,27 +42,23 @@ in {
       restartIfChanged = true;
 
       preStart = ''
-				PATH_CACHE="/var/lancache/cache"
-				PATH_LOGS="/var/lancache/logs"
-				WWW_USER="${cfg.user}"
-				WWW_GROUP="${cfg.group}"
-
-				mkdir -p $PATH_CACHE
-				cd $PATH_CACHE
-				mkdir -p installers tmp
-				mkdir -p $PATH_LOGS
+        mkdir -p ${cfg.statedir} && cd ${cfg.statedir}
+        PATH_CACHE=$PATH_BASE/cache
+        PATH_LOGS=$PATH_BASE/logs
 
-				chown -R $WWW_USER:$WWW_USER $PATH_CACHE
-				chown -R $WWW_USER:$WWW_USER $PATH_LOGS
+        mkdir -p cache/{installers,tmp} logs
+        rm -f conf; ln -s ${lancache} conf
+        chown -R ${cfg.user}:${cfg.group} .
         '';
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/nginx -c ${lancache}/nginx.conf -p ${lancache}";
+        ExecStart = "${cfg.package}/bin/nginx  -p ${cfg.statedir}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "always";
         RestartSec = "10s";
         StartLimitInterval = "1min";
       };
     };
+    environment.etc.nginx.source = lancache;
       users.extraUsers = (singleton
     { name = cfg.user;
       group = cfg.group;
-- 
cgit v1.2.3


From 984b7fd31b47bfbbee0e8adf8a1e6caa69376c2e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Jun 2017 12:00:18 +0200
Subject: ma: mv {,lanparty}/lancache

---
 makefu/2configs/lancache.nix          | 73 -----------------------------------
 makefu/2configs/lanparty/lancache.nix | 73 +++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 makefu/2configs/lancache.nix
 create mode 100644 makefu/2configs/lanparty/lancache.nix

diff --git a/makefu/2configs/lancache.nix b/makefu/2configs/lancache.nix
deleted file mode 100644
index ff5b0d788..000000000
--- a/makefu/2configs/lancache.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ pkgs, lib, config, ... }:
-with import <stockholm/lib>;
-let
-  # see https://github.com/zeropingheroes/lancache for full docs
-  lancache= pkgs.stdenv.mkDerivation rec {
-    name = "lancache-2017-06-26";
-    src = pkgs.fetchFromGitHub {
-      # origin: https://github.com/multiplay/lancache
-      # forked: https://github.com/zeropingheroes/lancache
-      repo = "lancache";
-      owner = "zeropingheroes";
-      rev = "143f7bb";
-      sha256 = "1ra4l7qz3k231j5wabr89s5hh80n1kk8vgd3dsh0xx5mdpjhvdl6";
-    };
-    phases = [ "unpackPhase" "installPhase" ];
-    # here we can chance to edit `includes/proxy-cache-paths.conf`
-    installPhase = ''
-      mkdir -p $out
-      cp -r * $out/
-      sed -i -e 's/^\(user\).*/\1 ${cfg.user} ${cfg.group};/' \
-             -e '1 idaemon off;' \
-              $out/nginx.conf
-    '';
-  };
-  cfg = {
-    group = "nginx-lancache";
-    user = "nginx-lancache";
-    statedir = "/var/lancache";
-    package = pkgs.stdenv.lib.overrideDerivation pkgs.nginx (old:{
-      configureFlags = old.configureFlags ++ [
-        "--with-http_slice_module"
-        "--with-stream"
-        "--with-pcre"
-        ];
-    });
-  };
-in {
-  systemd.services.nginx-lancache = {
-      description = "Nginx lancache Server";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      restartIfChanged = true;
-
-      preStart = ''
-        mkdir -p ${cfg.statedir} && cd ${cfg.statedir}
-        PATH_CACHE=$PATH_BASE/cache
-        PATH_LOGS=$PATH_BASE/logs
-
-        mkdir -p cache/{installers,tmp} logs
-        rm -f conf; ln -s ${lancache} conf
-        chown -R ${cfg.user}:${cfg.group} .
-        '';
-      serviceConfig = {
-        ExecStart = "${cfg.package}/bin/nginx  -p ${cfg.statedir}";
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        Restart = "always";
-        RestartSec = "10s";
-        StartLimitInterval = "1min";
-      };
-    };
-    environment.etc.nginx.source = lancache;
-      users.extraUsers = (singleton
-    { name = cfg.user;
-      group = cfg.group;
-      uid = genid cfg.group;
-    });
-
-    users.extraGroups = (singleton
-      { name = "${cfg.group}";
-        gid = genid cfg.group;
-    });
-
-}
diff --git a/makefu/2configs/lanparty/lancache.nix b/makefu/2configs/lanparty/lancache.nix
new file mode 100644
index 000000000..ff5b0d788
--- /dev/null
+++ b/makefu/2configs/lanparty/lancache.nix
@@ -0,0 +1,73 @@
+{ pkgs, lib, config, ... }:
+with import <stockholm/lib>;
+let
+  # see https://github.com/zeropingheroes/lancache for full docs
+  lancache= pkgs.stdenv.mkDerivation rec {
+    name = "lancache-2017-06-26";
+    src = pkgs.fetchFromGitHub {
+      # origin: https://github.com/multiplay/lancache
+      # forked: https://github.com/zeropingheroes/lancache
+      repo = "lancache";
+      owner = "zeropingheroes";
+      rev = "143f7bb";
+      sha256 = "1ra4l7qz3k231j5wabr89s5hh80n1kk8vgd3dsh0xx5mdpjhvdl6";
+    };
+    phases = [ "unpackPhase" "installPhase" ];
+    # here we can chance to edit `includes/proxy-cache-paths.conf`
+    installPhase = ''
+      mkdir -p $out
+      cp -r * $out/
+      sed -i -e 's/^\(user\).*/\1 ${cfg.user} ${cfg.group};/' \
+             -e '1 idaemon off;' \
+              $out/nginx.conf
+    '';
+  };
+  cfg = {
+    group = "nginx-lancache";
+    user = "nginx-lancache";
+    statedir = "/var/lancache";
+    package = pkgs.stdenv.lib.overrideDerivation pkgs.nginx (old:{
+      configureFlags = old.configureFlags ++ [
+        "--with-http_slice_module"
+        "--with-stream"
+        "--with-pcre"
+        ];
+    });
+  };
+in {
+  systemd.services.nginx-lancache = {
+      description = "Nginx lancache Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      restartIfChanged = true;
+
+      preStart = ''
+        mkdir -p ${cfg.statedir} && cd ${cfg.statedir}
+        PATH_CACHE=$PATH_BASE/cache
+        PATH_LOGS=$PATH_BASE/logs
+
+        mkdir -p cache/{installers,tmp} logs
+        rm -f conf; ln -s ${lancache} conf
+        chown -R ${cfg.user}:${cfg.group} .
+        '';
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/nginx  -p ${cfg.statedir}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "always";
+        RestartSec = "10s";
+        StartLimitInterval = "1min";
+      };
+    };
+    environment.etc.nginx.source = lancache;
+      users.extraUsers = (singleton
+    { name = cfg.user;
+      group = cfg.group;
+      uid = genid cfg.group;
+    });
+
+    users.extraGroups = (singleton
+      { name = "${cfg.group}";
+        gid = genid cfg.group;
+    });
+
+}
-- 
cgit v1.2.3


From 2dd0b055588ee5bf3262ec138265a881df4c01a5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Jun 2017 12:00:28 +0200
Subject: ma lancache-dns: init

---
 makefu/2configs/lanparty/lancache-dns.nix | 55 +++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 makefu/2configs/lanparty/lancache-dns.nix

diff --git a/makefu/2configs/lanparty/lancache-dns.nix b/makefu/2configs/lanparty/lancache-dns.nix
new file mode 100644
index 000000000..4b4ebf0a0
--- /dev/null
+++ b/makefu/2configs/lanparty/lancache-dns.nix
@@ -0,0 +1,55 @@
+{ pkgs, lib, config, ... }:
+with import <stockholm/lib>;
+let
+  # see https://github.com/zeropingheroes/lancache for full docs
+  lancache-dns = pkgs.stdenv.mkDerivation rec {
+    name = "lancache-dns-2017-06-28";
+    src = pkgs.fetchFromGitHub {
+      # forked: https://github.com/zeropingheroes/lancache-dns
+      repo = "lancache-dns";
+      owner = "zeropingheroes";
+      rev = "420aa62";
+      sha256 = "0ik7by7ripdv2avyy5kk9jp1i7rz9ksc8xmg7n9iik365q9pv94m";
+    };
+    phases = [ "unpackPhase" "installPhase" ];
+    # here we can chance to edit `includes/proxy-cache-paths.conf`
+    installPhase = ''
+      mkdir -p $out
+      cp -r * $out/
+    '';
+  };
+  stateDir = "/var/lib/unbound";
+  user = "unbound";
+  upstream-server = "8.8.8.8";
+in {
+  services.unbound = {
+    enable = true;
+    allowedAccess = [ "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" ];
+    interfaces = ["0.0.0.0" "::" ];
+    forwardAddresses = [ upstream-server ];
+    extraConfig = ''
+      include: "${stateDir}/lancache/*.conf"
+    '';
+  };
+  services.dnscrypt-proxy.enable = lib.mkForce false;
+  virtualisation.libvirtd.enable = lib.mkForce false;
+  systemd.services.dns-lancache-prepare = {
+      wantedBy = [ "unbound.service" ];
+      before = [ "unbound.service" ];
+      after = [ "network-online.target" ];
+      partOf= [ "unbound.service" ];
+
+      path = [ pkgs.gawk pkgs.iproute pkgs.gnused ];
+      script = ''
+        set -xeu
+        current_ip=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
+        old_ip=10.1.1.250
+        mkdir -p ${stateDir}
+        rm -rvf ${stateDir}/lancache
+        cp -r ${lancache-dns}/upstreams-available ${stateDir}/lancache
+        sed -i "s/$old_ip/$current_ip/g" ${stateDir}/lancache/*.conf
+        chown -R unbound ${stateDir}
+        '';
+    };
+  networking.firewall.allowedUDPPorts = [ 53 ];
+}
-- 
cgit v1.2.3


From 890e20f59ca67c612ce29dd356497062b935e81b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Jun 2017 23:46:27 +0200
Subject: ma vbob: remove videodrivers workaround

---
 makefu/1systems/vbob.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 7421125e4..53ee11474 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -14,8 +14,6 @@
 
     ];
   networking.extraHosts = import (toString <secrets/extra-hosts.nix>);
-  # workaround for https://github.com/NixOS/nixpkgs/issues/16641
-  services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
 
   nixpkgs.config.allowUnfree = true;
   fileSystems."/nix" = {
-- 
cgit v1.2.3


From 89fd62c21a65fc129c9f6dd59513a55a6298d921 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 29 Jun 2017 00:14:54 +0200
Subject: ma vbob: realtime kernel with jack-audio

---
 makefu/1systems/vbob.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 53ee11474..b79ec64c0 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -9,9 +9,19 @@
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
       ../2configs/main-laptop.nix #< base-gui
 
+      # Tools
+      ../2configs/tools/core.nix
+      ../2configs/tools/core-gui.nix
+      ../2configs/tools/dev.nix
+      ../2configs/tools/extra-gui.nix
+      ../2configs/tools/sec.nix
+
       # environment
       ../2configs/tinc/retiolum.nix
 
+      ../2configs/audio/jack-on-pulse.nix
+      ../2configs/audio/realtime-audio.nix
+
     ];
   networking.extraHosts = import (toString <secrets/extra-hosts.nix>);
 
-- 
cgit v1.2.3


From f8c534dc0e93e781563ce230b521dde49a361293 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 29 Jun 2017 00:15:21 +0200
Subject: ma jack-on-pulse: include jack_capture

---
 makefu/2configs/audio/jack-on-pulse.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/makefu/2configs/audio/jack-on-pulse.nix b/makefu/2configs/audio/jack-on-pulse.nix
index 49b61d5a2..a8ee05c7d 100644
--- a/makefu/2configs/audio/jack-on-pulse.nix
+++ b/makefu/2configs/audio/jack-on-pulse.nix
@@ -11,7 +11,10 @@ in
     package = pulse;
   };
 
-  environment.systemPackages = with pkgs; [ jack2Full ];
+  environment.systemPackages = with pkgs; [
+    jack2Full
+    jack_capture
+  ];
   # from http://anderspapitto.com/posts/2015-11-26-overtone-on-nixos-with-jack-and-pulseaudio.html
 
   systemd.user.services = {
-- 
cgit v1.2.3


From 47e4bafae5e183a1dfbcd5224b29d752b0103033 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 29 Jun 2017 00:15:56 +0200
Subject: ma audio: use latest kernel for musnix

---
 makefu/2configs/audio/realtime-audio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefu/2configs/audio/realtime-audio.nix b/makefu/2configs/audio/realtime-audio.nix
index fbeacd025..6cb18c45c 100644
--- a/makefu/2configs/audio/realtime-audio.nix
+++ b/makefu/2configs/audio/realtime-audio.nix
@@ -10,7 +10,7 @@ in
   musnix.enable = true;
   musnix.kernel.optimize = true;
   musnix.kernel.realtime = true;
-  # TODO: musnix.kernel.packages = pkgs.linuxPackages_latest_rt;
+  musnix.kernel.packages = pkgs.linuxPackages_latest_rt;
 
   users.users."${user}".extraGroups = [ "audio" ];
 }
-- 
cgit v1.2.3


From 51e091c7c3fb52579bc9ed59d1c7db633cd24e5b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 29 Jun 2017 00:16:15 +0200
Subject: ma sources: bump musnix

---
 makefu/2configs/sources/musnix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefu/2configs/sources/musnix.nix b/makefu/2configs/sources/musnix.nix
index d02dd4a48..a5be303e9 100644
--- a/makefu/2configs/sources/musnix.nix
+++ b/makefu/2configs/sources/musnix.nix
@@ -1,6 +1,6 @@
 {
   krebs.build.source.musnix.git = {
     url = https://github.com/musnix/musnix.git;
-    ref = "37a8378";
+    ref = "f0ec1f3";
   };
 }
-- 
cgit v1.2.3


From ed71d568831941632d2fa6e783d10d703c4ceee6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 29 Jun 2017 22:06:13 +0200
Subject: shell: init

---
 shell.nix | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 shell.nix

diff --git a/shell.nix b/shell.nix
new file mode 100644
index 000000000..d6e09e1a8
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,210 @@
+{ nixpkgs ? import <nixpkgs> {} }: let
+
+  inherit (nixpkgs) lib pkgs;
+  slib = import ./lib;
+  spkgs = {
+    populate = pkgs.callPackage ./krebs/5pkgs/simple/populate {};
+    whatsupnix = pkgs.callPackage ./krebs/5pkgs/simple/whatsupnix {};
+  };
+
+  # usage: deploy system=SYSTEM [target=TARGET]
+  cmds.deploy = pkgs.writeScript "cmds.deploy" /* sh */ ''
+    #! ${pkgs.dash}/bin/dash
+    set -efu
+
+    command=deploy
+    . ${init.args}
+    \test -n "''${target-}" || target=$system
+    . ${init.env}
+
+    exec ${utils.deploy}
+  '';
+
+  # usage: test system=SYSTEM target=TARGET
+  cmds.test = pkgs.writeScript "cmds.test" /* sh */ ''
+    #! ${pkgs.dash}/bin/dash
+    set -efu
+
+    command=test
+    . ${init.args}
+    . ${init.env}
+
+    export dummy_secrets=true
+    exec ${utils.build} config.system.build.toplevel
+  '';
+
+  init.args = pkgs.writeText "init.args" /* sh */ ''
+    fail=
+    for arg; do
+      case $arg in
+        system=*) system=''${arg#*=};;
+        target=*) target=''${arg#*=};;
+        *) echo "$command: bad argument: $arg" >&2; fail=1
+      esac
+    done
+    if \test -n "$fail"; then  
+      exit 1
+    fi
+    unset fail
+  '';
+
+  init.env = pkgs.writeText "init.env" /* sh */ ''
+    config=''${config-$LOGNAME/1systems/$system.nix}
+
+    export config
+    export system
+    export target
+
+    export target_object="$(${init.env.parsetarget} $target)"
+    export target_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)"
+    export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)"
+    export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)"
+    export target_path="$(echo $target_object | ${pkgs.jq}/bin/jq -r .path)"
+    export target_local="$(echo $target_object | ${pkgs.jq}/bin/jq -r .local)"
+
+    export qtarget="$target_user@$target_host:$target_port$target_path"
+
+    ${init.env.populate}
+
+    if \test "$target_local" != true && \test "''${DISABLE_PROXY-}" != 1; then
+      exec ${init.env.proxy} "$command" "$@"
+    fi
+  '' // {
+    parsetarget = pkgs.writeScript "init.env.parsetarget" /* sh */ ''
+      #! ${pkgs.dash}/bin/dash
+      set -efu
+      exec ${pkgs.jq}/bin/jq \
+          -enr \
+          --arg target "$1" \
+          -f ${init.env.parsetarget.jq}
+    '' // {
+      jq = pkgs.writeText "init.env.parsetarget.jq" ''
+        def when(c; f): if c then f else . end;
+        def capturesDef(i; v): .captures[i].string | when(. == null; v);
+        $target | match("^(?:([^@]+)@)?([^:/]+)?(?::([0-9]+))?(/.*)?$") | {
+          user: capturesDef(0; "root"),
+          host: capturesDef(1; env.system),
+          port: capturesDef(2; "22"),
+          path: capturesDef(3; "/var/src"),
+        } | . + {
+          local: (.user == env.LOGNAME and .host == env.HOSTNAME),
+        }
+      '';
+    };
+    populate = pkgs.writeScript "init.env.populate" /* sh */ ''
+      #! ${pkgs.dash}/bin/dash
+      set -efu
+      if \test "''${DISABLE_POPULATE-}" = 1; then
+        exit
+      fi
+      set -x
+      ${pkgs.nix}/bin/nix-instantiate \
+          --eval \
+          --json \
+          --readonly-mode \
+          --show-trace \
+          --strict \
+          -I nixos-config="$config" \
+          -E 'with import <stockholm>; config.krebs.build.source' \
+        |
+      ${spkgs.populate}/bin/populate "$qtarget" >&2
+    '';
+    proxy = pkgs.writeScript "init.env.proxy" /* sh */ ''
+      #! ${pkgs.dash}/bin/dash
+      set -efu
+      q() {
+        ${pkgs.jq}/bin/jq -nr --arg x "$*" '$x | @sh "\(.)"'
+      }
+      exec ${pkgs.openssh}/bin/ssh \
+        "$target_user@$target_host" -p "$target_port" \
+        cd "$target_path/stockholm" \; \
+        NIX_PATH=$(q "$target_path") \
+        STOCKHOLM_VERSION=$STOCKHOLM_VERSION \
+        nix-shell \
+            --command $(q \
+                config=$config \
+                system=$system \
+                target=$target \
+                DISABLE_POPULATE=1 \
+                DISABLE_PROXY=1 \
+                "$*"
+            )
+    '';
+  };
+
+  utils.build = pkgs.writeScript "utils.build" /* sh */ ''
+    #! ${pkgs.dash}/bin/dash
+    set -efu
+    expr=$1
+    shift
+    ${pkgs.nix}/bin/nix-build \
+        -Q \
+        --no-out-link \
+        --show-trace \
+        -E "with import <stockholm>; $expr" \
+        -I "$target_path" \
+        "$@" \
+      2>&1 |
+    ${pkgs.coreutils}/bin/stdbuf -oL ${spkgs.whatsupnix}/bin/whatsupnix
+  '';
+
+  utils.deploy = pkgs.writeScript "utils.deploy" /* sh */ ''
+    #! ${pkgs.dash}/bin/dash
+    set -efu
+    PATH=/run/current-system/sw/bin nixos-rebuild \
+        switch \
+        -Q \
+        --show-trace \
+        -I "$target_path" \
+        "$@" \
+      2>&1 |
+    ${pkgs.coreutils}/bin/stdbuf -oL ${spkgs.whatsupnix}/bin/whatsupnix
+  '';
+
+  hook.get-version = pkgs.writeScript "hook.get-version" /* sh */ ''
+    #! ${pkgs.dash}/bin/dash
+    set -efu
+    version=git.$(${pkgs.git}/bin/git describe --always --dirty)
+    case $version in (*-dirty)
+      version=$version@$HOSTNAME
+    esac
+    date=$(${pkgs.coreutils}/bin/date +%y.%m)
+    echo "$date.$version"
+  '';
+
+  hook.pkg = pkgs.runCommand "hook.pkg" {} /* sh */ ''
+    mkdir -p $out/bin
+    ${lib.concatStrings (lib.mapAttrsToList (name: path: /* sh */ ''
+      ln -s ${path} $out/bin/${name}
+    '') cmds)}
+  '';
+
+in pkgs.stdenv.mkDerivation {
+  name = "stockholm";
+  shellHook = ''
+    export NIX_PATH="stockholm=$PWD''${NIX_PATH+:$NIX_PATH}"
+    export PATH=${lib.makeBinPath [
+      hook.pkg
+    ]}
+
+    eval "$(declare -F | ${pkgs.gnused}/bin/sed s/declare/unset/)"
+    shopt -u no_empty_cmd_completion
+    unalias -a
+
+    enable -n \
+        . [ alias bg bind break builtin caller cd command compgen complete \
+        compopt continue dirs disown eval exec false fc fg getopts hash \
+        help history jobs kill let local logout mapfile popd printf pushd \
+        pwd read readarray readonly shift source suspend test times trap \
+        true typeset ulimit umask unalias wait
+
+    exitHandler() {
+      :
+    }
+
+    export HOSTNAME="$(${pkgs.nettools}/bin/hostname)"
+    export STOCKHOLM_VERSION="''${STOCKHOLM_VERSION-$(${hook.get-version})}"
+
+    PS1='\[\e[38;5;162m\]\w\[\e[0m\] '
+  '';
+}
-- 
cgit v1.2.3


From 0d9ded0b58b79fd35fa14f41726d9f8a4aa4a78e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 29 Jun 2017 23:51:16 +0200
Subject: Revert "k 4 infest: prepare Regression for stockholm"

This reverts commit d58e8035b4101b20539279247ec083b72ba0a647.
---
 krebs/4lib/infest/prepare.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index 8e921ce06..50d521e17 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -36,7 +36,14 @@ prepare() {(
             ;;
         esac
         ;;
-      nixos|stockholm)
+      nixos)
+        case $(cat /proc/cmdline) in
+          *' root=LABEL=NIXOS_ISO '*)
+            prepare_nixos_iso "$@"
+            exit
+        esac
+        ;;
+      stockholm)
         case $(cat /proc/cmdline) in
           *' root=LABEL=NIXOS_ISO '*)
             prepare_nixos_iso "$@"
@@ -95,8 +102,7 @@ prepare_nixos_iso() {
   mkdir -p bin
   rm -f bin/nixos-install
   cp "$(type -p nixos-install)" bin/nixos-install
-  sed -i 's@^\(\(export \|\)NIX_PATH\)=\"[^\"]*\"@\1=$target_path@' bin/nixos-install
-
+  sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
 }
 
 get_nixos_install() {
@@ -211,7 +217,7 @@ prepare_common() {(
   mkdir -p bin
   rm -f bin/nixos-install
   cp "$(type -p nixos-install)" bin/nixos-install
-  sed -i 's@^\(\(export \|\)NIX_PATH\)=\"[^\"]*\"@\1=$target_path@' bin/nixos-install
+  sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
 
   if ! grep -q '^PATH.*#krebs' .bashrc; then
     echo '. /root/.nix-profile/etc/profile.d/nix.sh' >> .bashrc
-- 
cgit v1.2.3


From b9c11e44e779769ca0a6b13eedee82782bc63927 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Jun 2017 03:16:24 +0200
Subject: shell: mark shellHook as sh

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index d6e09e1a8..26db52c32 100644
--- a/shell.nix
+++ b/shell.nix
@@ -181,7 +181,7 @@
 
 in pkgs.stdenv.mkDerivation {
   name = "stockholm";
-  shellHook = ''
+  shellHook = /* sh */ ''
     export NIX_PATH="stockholm=$PWD''${NIX_PATH+:$NIX_PATH}"
     export PATH=${lib.makeBinPath [
       hook.pkg
-- 
cgit v1.2.3


From 849d0ba98f03dc8700e6b9bb724b9afdbde68713 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Jun 2017 04:27:02 +0200
Subject: shell: using proxy implies populated target

---
 shell.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/shell.nix b/shell.nix
index 26db52c32..9cc740663 100644
--- a/shell.nix
+++ b/shell.nix
@@ -64,10 +64,11 @@
 
     export qtarget="$target_user@$target_host:$target_port$target_path"
 
-    ${init.env.populate}
-
-    if \test "$target_local" != true && \test "''${DISABLE_PROXY-}" != 1; then
-      exec ${init.env.proxy} "$command" "$@"
+    if \test "''${using_proxy-}" != true; then
+      ${init.env.populate}
+      if \test "$target_local" != true; then
+        exec ${init.env.proxy} "$command" "$@"
+      fi
     fi
   '' // {
     parsetarget = pkgs.writeScript "init.env.parsetarget" /* sh */ ''
@@ -94,10 +95,6 @@
     populate = pkgs.writeScript "init.env.populate" /* sh */ ''
       #! ${pkgs.dash}/bin/dash
       set -efu
-      if \test "''${DISABLE_POPULATE-}" = 1; then
-        exit
-      fi
-      set -x
       ${pkgs.nix}/bin/nix-instantiate \
           --eval \
           --json \
@@ -125,8 +122,7 @@
                 config=$config \
                 system=$system \
                 target=$target \
-                DISABLE_POPULATE=1 \
-                DISABLE_PROXY=1 \
+                using_proxy=true \
                 "$*"
             )
     '';
-- 
cgit v1.2.3


From 7d983f09c8433b623ffb49435807d3417a93776b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Jun 2017 04:27:25 +0200
Subject: shell: inline qtarget

---
 shell.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell.nix b/shell.nix
index 9cc740663..e16f172e9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -62,8 +62,6 @@
     export target_path="$(echo $target_object | ${pkgs.jq}/bin/jq -r .path)"
     export target_local="$(echo $target_object | ${pkgs.jq}/bin/jq -r .local)"
 
-    export qtarget="$target_user@$target_host:$target_port$target_path"
-
     if \test "''${using_proxy-}" != true; then
       ${init.env.populate}
       if \test "$target_local" != true; then
@@ -104,7 +102,9 @@
           -I nixos-config="$config" \
           -E 'with import <stockholm>; config.krebs.build.source' \
         |
-      ${spkgs.populate}/bin/populate "$qtarget" >&2
+      ${spkgs.populate}/bin/populate \
+          "$target_user@$target_host:$target_port$target_path" \
+        >&2
     '';
     proxy = pkgs.writeScript "init.env.proxy" /* sh */ ''
       #! ${pkgs.dash}/bin/dash
-- 
cgit v1.2.3


From 74522bba94a3a62dcaed15c6ab9ff4e064a654ab Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Jun 2017 04:40:45 +0200
Subject: shell: use stockholm overlay

---
 shell.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/shell.nix b/shell.nix
index e16f172e9..d8f3184db 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,11 +1,7 @@
-{ nixpkgs ? import <nixpkgs> {} }: let
+{ nixpkgs ? import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; } }: let
 
   inherit (nixpkgs) lib pkgs;
   slib = import ./lib;
-  spkgs = {
-    populate = pkgs.callPackage ./krebs/5pkgs/simple/populate {};
-    whatsupnix = pkgs.callPackage ./krebs/5pkgs/simple/whatsupnix {};
-  };
 
   # usage: deploy system=SYSTEM [target=TARGET]
   cmds.deploy = pkgs.writeScript "cmds.deploy" /* sh */ ''
@@ -102,7 +98,7 @@
           -I nixos-config="$config" \
           -E 'with import <stockholm>; config.krebs.build.source' \
         |
-      ${spkgs.populate}/bin/populate \
+      ${pkgs.populate}/bin/populate \
           "$target_user@$target_host:$target_port$target_path" \
         >&2
     '';
@@ -141,7 +137,7 @@
         -I "$target_path" \
         "$@" \
       2>&1 |
-    ${pkgs.coreutils}/bin/stdbuf -oL ${spkgs.whatsupnix}/bin/whatsupnix
+    ${pkgs.coreutils}/bin/stdbuf -oL ${pkgs.whatsupnix}/bin/whatsupnix
   '';
 
   utils.deploy = pkgs.writeScript "utils.deploy" /* sh */ ''
@@ -154,7 +150,7 @@
         -I "$target_path" \
         "$@" \
       2>&1 |
-    ${pkgs.coreutils}/bin/stdbuf -oL ${spkgs.whatsupnix}/bin/whatsupnix
+    ${pkgs.coreutils}/bin/stdbuf -oL ${pkgs.whatsupnix}/bin/whatsupnix
   '';
 
   hook.get-version = pkgs.writeScript "hook.get-version" /* sh */ ''
-- 
cgit v1.2.3


From dbe4cc21e33ccc22b9dd352dd8c6913d60a0cbc0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Jun 2017 04:53:34 +0200
Subject: pkgs.whatsupnix: print gawk output ASAP

---
 krebs/5pkgs/simple/whatsupnix/whatsupnix.bash | 2 +-
 shell.nix                                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
index 127209570..2ad9aadc9 100644
--- a/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
+++ b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
@@ -26,7 +26,7 @@ gawk -v failed_drvs="$failed_drvs" '
   match($0, /^builder for ‘(\/nix\/store\/[^’]+\.drv)’ failed/, m) {
     print m[1] >> failed_drvs
   }
-  { print $0 }
+  { print $0; fflush("/dev/stdout") }
 '
 
 case $# in
diff --git a/shell.nix b/shell.nix
index d8f3184db..302429a4c 100644
--- a/shell.nix
+++ b/shell.nix
@@ -137,7 +137,7 @@
         -I "$target_path" \
         "$@" \
       2>&1 |
-    ${pkgs.coreutils}/bin/stdbuf -oL ${pkgs.whatsupnix}/b