From 207c451d7d9c816270803a5c8d4e8b4a6e6ec0c7 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Wed, 22 Feb 2017 21:35:38 +0100
Subject: [PATCH 01/30] n 2 nixpkgs: d2cd8a0 -> 6651c72

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

diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
index 27a845bd5..ad39848b6 100644
--- a/nin/2configs/nixpkgs.nix
+++ b/nin/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://github.com/nixos/nixpkgs;
-    ref = "d2cd8a0";
+    ref = "6651c72";
   };
 }

From 95a178a5dfafc0e06548cd005f99e5abd8dc8c78 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Fri, 3 Mar 2017 14:09:53 +0100
Subject: [PATCH 02/30] n 1 hiawatha: add git + git config

---
 nin/1systems/hiawatha.nix | 5 ++++-
 nin/2configs/git.nix      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nin/1systems/hiawatha.nix b/nin/1systems/hiawatha.nix
index af865497e..12f2718bc 100644
--- a/nin/1systems/hiawatha.nix
+++ b/nin/1systems/hiawatha.nix
@@ -10,8 +10,11 @@ with lib;
   imports = [
     ../.
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ../2configs/retiolum.nix
+    ../2configs/copyq.nix
+    ../2configs/games.nix
     ../2configs/git.nix
+    ../2configs/retiolum.nix
+    ../2configs/termite.nix
   ];
 
   krebs.build.host = config.krebs.hosts.hiawatha;
diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix
index 39f919e79..6bdc857d8 100644
--- a/nin/2configs/git.nix
+++ b/nin/2configs/git.nix
@@ -5,6 +5,7 @@ with import <stockholm/lib>;
 let
 
   out = {
+    services.nginx.enable = true;
     krebs.git = {
       enable = true;
       cgit = {

From 23314b0aca248d234c122dab4eaaaaf2c9286677 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Fri, 3 Mar 2017 14:11:07 +0100
Subject: [PATCH 03/30] n 2: add copyq

---
 nin/2configs/copyq.nix | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 nin/2configs/copyq.nix

diff --git a/nin/2configs/copyq.nix b/nin/2configs/copyq.nix
new file mode 100644
index 000000000..0616c4025
--- /dev/null
+++ b/nin/2configs/copyq.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+let
+  copyqConfig = pkgs.writeDash "copyq-config" ''
+    ${pkgs.copyq}/bin/copyq config check_clipboard true
+    ${pkgs.copyq}/bin/copyq config check_selection true
+    ${pkgs.copyq}/bin/copyq config copy_clipboard true
+    ${pkgs.copyq}/bin/copyq config copy_selection true
+
+    ${pkgs.copyq}/bin/copyq config activate_closes true
+    ${pkgs.copyq}/bin/copyq config clipboard_notification_lines 0
+    ${pkgs.copyq}/bin/copyq config clipboard_tab clipboard
+    ${pkgs.copyq}/bin/copyq config disable_tray true
+    ${pkgs.copyq}/bin/copyq config hide_tabs true
+    ${pkgs.copyq}/bin/copyq config hide_toolbar true
+    ${pkgs.copyq}/bin/copyq config item_popup_interval true
+    ${pkgs.copyq}/bin/copyq config maxitems 1000
+    ${pkgs.copyq}/bin/copyq config move true
+    ${pkgs.copyq}/bin/copyq config text_wrap true
+  '';
+in {
+  systemd.user.services.copyq = {
+    after = [ "graphical.target" ];
+    wants = [ "graphical.target" ];
+    wantedBy = [ "default.target" ];
+    environment = {
+      DISPLAY = ":0";
+    };
+    serviceConfig = {
+      SyslogIdentifier = "copyq";
+      ExecStart = "${pkgs.copyq}/bin/copyq";
+      ExecStartPost = copyqConfig;
+      Restart = "always";
+      RestartSec = "2s";
+      StartLimitBurst = 0;
+    };
+  };
+}

From 953046f7218f9752b5164b45301d87ed1995e351 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Fri, 3 Mar 2017 14:11:40 +0100
Subject: [PATCH 04/30] n 2: steal games from lass

---
 nin/2configs/games.nix | 70 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 nin/2configs/games.nix

diff --git a/nin/2configs/games.nix b/nin/2configs/games.nix
new file mode 100644
index 000000000..a7edae078
--- /dev/null
+++ b/nin/2configs/games.nix
@@ -0,0 +1,70 @@
+{ config, pkgs, ... }:
+
+let
+  mainUser = config.users.extraUsers.mainUser;
+  vdoom = pkgs.writeDash "vdoom" ''
+    ${pkgs.zandronum-bin}/bin/zandronum \
+      -fov 120 \
+      "$@"
+  '';
+  doom = pkgs.writeDash "doom" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} \
+      -file $DOOM_DIR/lib/brutalv20.pk3 \
+      "$@"
+  '';
+  doom1 = pkgs.writeDashBin "doom1" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${doom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
+  '';
+  doom2 = pkgs.writeDashBin "doom2" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
+  '';
+  vdoom1 = pkgs.writeDashBin "vdoom1" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
+  '';
+  vdoom2 = pkgs.writeDashBin "vdoom2" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
+  '';
+
+  doomservercfg = pkgs.writeText "doomserver.cfg" ''
+    skill 7
+    #survival true
+    #sv_maxlives 4
+    #sv_norespawn true
+    #sv_weapondrop true
+    no_jump true
+    #sv_noweaponspawn true
+    sv_sharekeys true
+    sv_survivalcountdowntime 1
+    sv_noteamselect true
+    sv_updatemaster false
+    #sv_coop_loseinventory true
+    #cl_startasspectator false
+    #lms_spectatorview false
+  '';
+
+  vdoomserver = pkgs.writeDashBin "vdoomserver" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+
+    ${pkgs.zandronum-bin}/bin/zandronum-server \
+    +exec ${doomservercfg} \
+    "$@"
+  '';
+
+in {
+  environment.systemPackages = with pkgs; [
+    dwarf_fortress
+    doom1
+    doom2
+    vdoom1
+    vdoom2
+    vdoomserver
+  ];
+
+  hardware.pulseaudio.support32Bit = true;
+
+}

From 01868340e25ffb05ea8b784c5cdf47c251157dfb Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Fri, 3 Mar 2017 14:12:15 +0100
Subject: [PATCH 05/30] n 2: add termite terminal

---
 nin/2configs/termite.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 nin/2configs/termite.nix

diff --git a/nin/2configs/termite.nix b/nin/2configs/termite.nix
new file mode 100644
index 000000000..942446b01
--- /dev/null
+++ b/nin/2configs/termite.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = [
+    pkgs.termite
+  ];
+
+  krebs.per-user.nin.packages = let
+    termitecfg = pkgs.writeTextFile {
+      name = "termite-config";
+      destination = "/etc/xdg/termite/config";
+      text = ''
+        [colors]
+        foreground = #d0d7d0
+        background = #000000
+      '';
+    };
+  in [
+    termitecfg
+  ];
+
+}

From c05764274e5043912204b56cb1f032e1d5db6717 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 15 Feb 2017 08:15:35 +0100
Subject: [PATCH 06/30] k 5 dymo-cups-drivers: init at 1.4.0

---
 makefu/5pkgs/dymo-cups-drivers/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 makefu/5pkgs/dymo-cups-drivers/default.nix

diff --git a/makefu/5pkgs/dymo-cups-drivers/default.nix b/makefu/5pkgs/dymo-cups-drivers/default.nix
new file mode 100644
index 000000000..d47bae6dd
--- /dev/null
+++ b/makefu/5pkgs/dymo-cups-drivers/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, pkgs, fetchurl, cups, ... }:
+
+stdenv.mkDerivation rec {
+  name = "dymo-cups-drivers-${version}";
+  version = "1.4.0";
+  src = fetchurl {
+    url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${name}.tar.gz";
+    sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6";
+  };
+  buildInputs = [ cups ];
+  makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
+
+  # acd_cli gets dumped in bin and gets overwritten by fixupPhase
+  meta = {
+    description = "Dymo printer drivers";
+  };
+}

From d5f26f28317a923397a36309554396194bfcad27 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 16 Feb 2017 18:28:59 +0100
Subject: [PATCH 07/30] m umts: add apn option

---
 makefu/1systems/x.nix    | 1 +
 makefu/3modules/umts.nix | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 08da92068..57e120e63 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -66,6 +66,7 @@
     ];
   makefu.server.primary-itf = "wlp2s0";
   makefu.full-populate = true;
+  makefu.umts.apn = "web.vodafone.de";
 
   nixpkgs.config.allowUnfree = true;
   krebs.nginx = {
diff --git a/makefu/3modules/umts.nix b/makefu/3modules/umts.nix
index 91ac13755..86669945a 100644
--- a/makefu/3modules/umts.nix
+++ b/makefu/3modules/umts.nix
@@ -26,7 +26,7 @@ let
     Dial Command = ATDT
     Modem = ${cfg.modem-device}
     Baud = 460800
-    Init1 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
+    Init1 = AT+CGDCONT=1,"IP","${config.makefu.umts.apn}","",0,0
     Init2 = ATZ
     Init3 = ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0
     ISDN = 0
@@ -54,6 +54,13 @@ let
         to avoid race conditions.
       '';
     };
+    apn = mkOption {
+      default = "pinternet.interkom.de";
+      type = types.str;
+      description = ''
+        apn to use for dailing
+      '';
+    };
   };
 
   imp = {

From 3f3325a55e4a581cc3c7ab066e9fb883b1639bdc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 18 Feb 2017 05:11:59 +0100
Subject: [PATCH 08/30] m x: replace laptop with new x230 (without coreboot)

---
 makefu/2configs/hw/tp-x230.nix   | 10 ++++++++--
 makefu/5pkgs/awesomecfg/full.cfg |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 99563a771..855fda952 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -9,20 +9,26 @@ with import <stockholm/lib>;
     kernelModules = [
       "kvm-intel"
       "thinkpad_ec"
-   #   "acpi_call"
+      "acpi_call"
    #   "thinkpad_acpi"
    #   "tpm-rng"
     ];
     extraModulePackages = [
-    #  config.boot.kernelPackages.acpi_call
+      config.boot.kernelPackages.acpi_call
     ];
   };
+
+  # configured media keys inside awesomerc
+  # sound.mediaKeys.enable = true;
+  hardware.bluetooth.enable = true;
+
   services.acpid.enable = true;
   hardware.opengl.extraPackages =  [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
   services.xserver = {
     videoDriver = "intel";
     deviceSection = ''
       Option "AccelMethod" "sna"
+      Option "Backlight"     "intel_backlight"
     '';
   };
   # no entropy source working
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 8036e5765..e43341d25 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -364,6 +364,10 @@ globalkeys = awful.util.table.join(
               end,
               {description = "restore minimized", group = "client"}),
 
+    awful.key({ }, "XF86MonBrightnessUp", function ()
+        awful.util.spawn("xbacklight -inc 5", false) end),
+    awful.key({ }, "XF86MonBrightnessDown", function ()
+        awful.util.spawn("xbacklight -dec 5", false) end),
 
     awful.key({ }, "XF86AudioRaiseVolume", function ()
         awful.util.spawn("amixer set Master 5%+", false) end),

From 01b5372467faf232d59aa49b2a1e670ae5f4599a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Feb 2017 14:25:44 +0100
Subject: [PATCH 09/30] unstable @ 2017-02-28

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

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 45f7315b0..74d3635bd 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "f66d782"; # unstable @ 2017-02-04
+          ref = "53a2baa"; # unstable @ 2017-02-28
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
@@ -159,7 +159,7 @@ with import <stockholm/lib>;
     auto-optimise-store = true
   '';
 
-  security.setuidPrograms = [ "sendmail" ];
+  security.wrappers.sendmail.source = "${pkgs.exim}/bin/sendmail";
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M

From f32d84e23d1785463af9242bb616325b6ae58ada Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:43:15 +0100
Subject: [PATCH 10/30] m 5 wol: rm, is now upstream

---
 makefu/5pkgs/wol/default.nix | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 makefu/5pkgs/wol/default.nix

diff --git a/makefu/5pkgs/wol/default.nix b/makefu/5pkgs/wol/default.nix
deleted file mode 100644
index a6d54b8a2..000000000
--- a/makefu/5pkgs/wol/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  proj = "wake-on-lan";
-  name = "wol-${version}";
-  version = "0.7.1";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/${proj}/${name}.tar.gz";
-    sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270";
-  };
-
-  meta = {
-    description = "simple wake-on-lan client";
-    homepage = https://sourceforge.net/projects/wake-on-lan/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ makefu ];
-  };
-}

From 8bacb23ad46c7c4feb8ba097ce2c221579065c2e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:45:50 +0100
Subject: [PATCH 11/30] m 5 esptool: ninit

---
 makefu/2configs/base-gui.nix        |  2 +-
 makefu/2configs/laptop-utils.nix    | 65 -----------------------------
 makefu/2configs/tools/all.nix       | 10 +++++
 makefu/2configs/tools/core-gui.nix  | 25 +++++++++++
 makefu/2configs/tools/core.nix      | 41 ++++++++++++++++++
 makefu/2configs/tools/dev.nix       | 10 +++++
 makefu/2configs/tools/extra-gui.nix | 12 ++++++
 makefu/2configs/tools/media.nix     | 12 ++++++
 makefu/2configs/tools/sec.nix       | 15 +++++++
 makefu/5pkgs/esptool/default.nix    | 32 ++++++++++++++
 10 files changed, 158 insertions(+), 66 deletions(-)
 delete mode 100644 makefu/2configs/laptop-utils.nix
 create mode 100644 makefu/2configs/tools/all.nix
 create mode 100644 makefu/2configs/tools/core-gui.nix
 create mode 100644 makefu/2configs/tools/core.nix
 create mode 100644 makefu/2configs/tools/dev.nix
 create mode 100644 makefu/2configs/tools/extra-gui.nix
 create mode 100644 makefu/2configs/tools/media.nix
 create mode 100644 makefu/2configs/tools/sec.nix
 create mode 100644 makefu/5pkgs/esptool/default.nix

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 95ebabc44..43b37cd8c 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -82,7 +82,7 @@ in
 
       URxvt.perl-ext:      default,url-select
       URxvt.keysym.M-u:    perl:url-select:select_next
-      URxvt.url-select.launcher:   chromium
+      URxvt.url-select.launcher:   firefox -new-tab
       URxvt.url-select.underline: true
       URxvt.searchable-scrollback: CM-s
     '';
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
deleted file mode 100644
index ec6d4adec..000000000
--- a/makefu/2configs/laptop-utils.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ pkgs, ... }:
-
-# tools i use when actually working with the host.
-# package version will now be maintained by nix-rebuild
-#
-# essentially `nix-env -q` of the main user
-# TODO: split gui and non-gui
-{
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
-  krebs.per-user.makefu.packages = with pkgs; [
-    # core
-    at_spi2_core
-    acpi
-    bc
-    exif
-    file
-    ntfs3g
-    pv
-    proot
-    sshpass
-    unzip
-    unrar
-    usbutils
-    zip
-
-    # dev
-    python35Packages.virtualenv
-
-
-    # gui
-    chromium
-    clipit
-    feh
-    firefox
-    keepassx
-    pcmanfm
-    skype
-    mirage
-    tightvnc
-    gnome3.dconf
-    vlc
-    virtmanager
-    wireshark
-    xdotool
-
-    # sectools
-    aria2
-    pythonPackages.binwalk-full
-    dnsmasq
-    iodine
-    mtr
-    nmap
-
-
-    # stuff
-    cac-api
-    cac-panel
-    krebspaste
-    ledger
-    pass
-  ];
-}
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
new file mode 100644
index 000000000..09344d99d
--- /dev/null
+++ b/makefu/2configs/tools/all.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./core.nix
+    ./core-gui.nix
+    ./extra-gui.nix
+    ./dev.nix
+    ./sec.nix
+    ./media.nix
+  ];
+}
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
new file mode 100644
index 000000000..518a60eac
--- /dev/null
+++ b/makefu/2configs/tools/core-gui.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.firefox = {
+    enableAdobeFlash = true;
+  };
+
+  krebs.per-user.makefu.packages = with pkgs; [
+    chromium
+    clipit
+    feh
+    firefox
+    keepassx
+    pcmanfm
+    skype
+    mirage
+    tightvnc
+    gnome3.dconf
+    vlc
+    wireshark
+    xdotool
+    scrot
+    
+  ];
+}
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
new file mode 100644
index 000000000..56d60812e
--- /dev/null
+++ b/makefu/2configs/tools/core.nix
@@ -0,0 +1,41 @@
+{ pkgs, ... }:
+
+# tools i use when actually working with the host.
+# package version will now be maintained by nix-rebuild
+#
+# essentially `nix-env -q` of the main user
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    at_spi2_core
+    acpi
+    bc
+    exif
+    file
+    ntfs3g
+    pv
+    proot
+    sshpass
+    usbutils
+    p7zip
+    hdparm
+    inetutils
+    ncftp
+    mutt
+    tcpdump
+    sysstat
+    which
+    weechat
+    curl
+    wget
+    wol
+    tmux
+    smartmontools
+    iftop
+
+    cac-api
+    cac-panel
+    krebspaste
+    ledger
+    pass
+  ];
+}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
new file mode 100644
index 000000000..8acc25fcc
--- /dev/null
+++ b/makefu/2configs/tools/dev.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs;[
+    nodemcu-uploader
+    esptool
+    python35Packages.virtualenv
+    flashrom
+  ];
+}
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
new file mode 100644
index 000000000..6b8a5af66
--- /dev/null
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs;[
+    inkscape
+    gimp
+    skype
+    virtmanager
+    synergy
+    
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
new file mode 100644
index 000000000..67159a176
--- /dev/null
+++ b/makefu/2configs/tools/media.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.firefox = {
+    enableAdobeFlash = true;
+  };
+
+  krebs.per-user.makefu.packages = with pkgs; [
+    kodi
+    streamripper
+  ];
+}
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
new file mode 100644
index 000000000..3a2a84556
--- /dev/null
+++ b/makefu/2configs/tools/sec.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    aria2
+    mitmproxy
+    pythonPackages.binwalk-full
+    dnsmasq
+    iodine
+    mtr
+    nmap
+    msf
+    thc-hydra
+  ];
+}
diff --git a/makefu/5pkgs/esptool/default.nix b/makefu/5pkgs/esptool/default.nix
new file mode 100644
index 000000000..84bb232cd
--- /dev/null
+++ b/makefu/5pkgs/esptool/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, fetchFromGitHub, ... }:
+with pkgs.python2Packages;
+let
+  pyaes = buildPythonPackage rec {
+      name = "pyaes-${version}";
+      version = "1.6.0";
+      src = fetchFromGitHub {
+        owner = "ricmoo";
+        repo = "pyaes";
+        rev = "v${version}";
+        sha256 = "04934a9zgwc8g3qhfrkcfv0bs557paigllnkrnfhp9m1azr3bfqb";
+      };
+      doCheck = false;
+  };
+in
+buildPythonPackage rec {
+    name = "esptool-${version}";
+    version = "2.0beta2";
+    propagatedBuildInputs = [
+      pyserial
+      flake8
+      ecdsa
+      pyaes
+    ];
+    src = fetchFromGitHub {
+      owner = "themadinventor";
+      repo = "esptool";
+      rev = "v${version}";
+      sha256 = "0n96pyi1k4qlyfqk5k7xpgq8726wz74qvd3gqjg0bpsl3wr7l94i";
+    };
+    doCheck = false;
+}

From 0412d9c1156d78f0db3c2408ac224c50ebf43c7e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:46:23 +0100
Subject: [PATCH 12/30] m 2 central-stats-server: use updated kapacitor

---
 makefu/2configs/logging/central-stats-server.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/makefu/2configs/logging/central-stats-server.nix b/makefu/2configs/logging/central-stats-server.nix
index 8151d4939..30ad63879 100644
--- a/makefu/2configs/logging/central-stats-server.nix
+++ b/makefu/2configs/logging/central-stats-server.nix
@@ -5,10 +5,9 @@ let
   collectd-port = 25826;
   influx-port = 8086;
   grafana-port = 3000; # TODO nginx forward
+  db = "collectd_db";
+  logging-interface = config.makefu.server.primary-itf;
 in {
-  imports = [
-    ../../../lass/3modules/kapacitor.nix
-  ];
   services.grafana.enable = true;
   services.grafana.addr = "0.0.0.0";
 
@@ -27,11 +26,11 @@ in {
     collectd = [{
       enabled = true;
       typesdb = "${pkgs.collectd}/share/collectd/types.db";
-      database = "collectd_db";
+      database = db;
       port = collectd-port;
     }];
   };
-  lass.kapacitor =
+  krebs.kapacitor =
    let
       echoToIrc = pkgs.writeDash "echo_irc" ''
         set -euf
@@ -43,7 +42,8 @@ in {
   in {
     enable = true;
     alarms = {
-      cpu_deadman = ''
+      cpu_deadman.database = db;
+      cpu_deadman.text = ''
         var data = batch
             |query(${"'''"}
                   SELECT mean("value") AS mean
@@ -68,5 +68,8 @@ in {
     iptables -A INPUT -i retiolum -p udp --dport ${toString collectd-port} -j ACCEPT
     iptables -A INPUT -i retiolum -p tcp --dport ${toString influx-port} -j ACCEPT
     iptables -A INPUT -i retiolum -p tcp --dport ${toString grafana-port} -j ACCEPT
+    iptables -A INPUT -i ${logging-interface} -p udp --dport ${toString collectd-port} -j ACCEPT
+    iptables -A INPUT -i ${logging-interface} -p tcp --dport ${toString influx-port} -j ACCEPT
+    iptables -A INPUT -i ${logging-interface} -p tcp --dport ${toString grafana-port} -j ACCEPT
   '';
 }

From d88b9ded5f09d5df8784a75d2ae92f3500bd9f6d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:46:43 +0100
Subject: [PATCH 13/30] m 2 omo-share: expose media-rw

---
 makefu/2configs/omo-share.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/omo-share.nix
index 8a3eab98a..7d7a4ec57 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/omo-share.nix
@@ -48,15 +48,8 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
-      crypt0-rw = {
-        path = "/media/crypt0/";
-        "read only" = "no";
-        browseable = "yes";
-        "guest ok" = "no";
-        "valid users" = "makefu";
-      };
-      crypt1-rw = {
-        path = "/media/crypt1/";
+      media-rw = {
+        path = "/media/";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "no";

From af83dea03c002e0dc1c907c429b378ba97da0ba3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:47:27 +0100
Subject: [PATCH 14/30] k 2 tools/sec: do not deploy mitmproxy (broken)

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

diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 3a2a84556..5ab699f35 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -3,7 +3,7 @@
 {
   krebs.per-user.makefu.packages = with pkgs; [
     aria2
-    mitmproxy
+    # mitmproxy
     pythonPackages.binwalk-full
     dnsmasq
     iodine

From 5b53760ee406c662dad7121def60d82c14e6d743 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:48:11 +0100
Subject: [PATCH 15/30] m 1 filepimp: new interface

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

diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp.nix
index 0fabf6d93..e143d0046 100644
--- a/makefu/1systems/filepimp.nix
+++ b/makefu/1systems/filepimp.nix
@@ -3,7 +3,7 @@ let
   byid = dev: "/dev/disk/by-id/" + dev;
   part1 = disk: disk + "-part1";
   rootDisk = byid "ata-SanDisk_SDSSDP064G_140237402890";
-  primary-interface = "enp2s0"; # c8:cb:b8:cf:e4:dc
+  primary-interface = "enp3s0"; # c8:cb:b8:cf:e4:dc
   # N54L Chassis:
   # ____________________
   # |______FRONT_______|

From c96761176276f39e23767f92582aa1af13ee7a26 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:50:58 +0100
Subject: [PATCH 16/30] main-laptop: use tools,security wrappers

---
 makefu/2configs/main-laptop.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index e1c3d20ff..eaf6dec97 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -14,7 +14,8 @@ in {
     ./base-gui.nix
     ./fetchWallpaper.nix
     ./zsh-user.nix
-    ./laptop-utils.nix
+    ./tools/core.nix
+    ./tools/core-gui.nix
   ];
 
   users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
@@ -60,7 +61,7 @@ in {
             sleep 1
           '')
           [ 5 4 3 2 1 ]}
-        /var/setuid-wrappers/sudo ${pkgs.systemd}/bin/systemctl suspend
+        /var/run/wrappers/bin/sudo ${pkgs.systemd}/bin/systemctl suspend
       '';
     };
   };

From f23801beae6c54ca225df3d60d3dc1b0cda5471b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:51:18 +0100
Subject: [PATCH 17/30] m 2 printer: use dymo cups driver

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

diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index d288748f9..7c7b00abc 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -5,6 +5,7 @@
     enable = true;
     drivers = [
       pkgs.samsungUnifiedLinuxDriver
+      pkgs.dymo-cups-drivers
     ];
   };
 

From 4eeecc9dbde44592451ef1295593e69fe80473cc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:51:48 +0100
Subject: [PATCH 18/30] m 1 x: do not use virtualbox, build with exfat-nofuse

---
 makefu/1systems/x.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 57e120e63..1e29876e7 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -8,7 +8,7 @@
     [ # base
       ../.
       ../2configs/main-laptop.nix
-      ../2configs/laptop-utils.nix
+      ../2configs/tools/all.nix
       ../2configs/laptop-backup.nix
       ../2configs/dnscrypt.nix
 
@@ -46,7 +46,7 @@
       ../2configs/mail-client.nix
       ../2configs/printer.nix
       ../2configs/virtualization.nix
-      ../2configs/virtualization-virtualbox.nix
+      # ../2configs/virtualization-virtualbox.nix
       ../2configs/wwan.nix
       ../2configs/rad1o.nix
 
@@ -64,7 +64,9 @@
       ../2configs/fs/sda-crypto-root-home.nix
 
     ];
-  makefu.server.primary-itf = "wlp2s0";
+  boot.kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ];
+
+  makefu.server.primary-itf = "wlp3s0";
   makefu.full-populate = true;
   makefu.umts.apn = "web.vodafone.de";
 
@@ -75,6 +77,7 @@
     servers.default.server-names = [ "_" ];
   };
 
+  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
   environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
 
   virtualisation.docker.enable = true;

From 1135487724b442b78d7f4d863c02ab6b7fb801b2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:53:16 +0100
Subject: [PATCH 19/30] m x230: move specific config to general config

---
 makefu/1systems/x.nix          | 1 -
 makefu/2configs/hw/tp-x230.nix | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 1e29876e7..9666f50ff 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -64,7 +64,6 @@
       ../2configs/fs/sda-crypto-root-home.nix
 
     ];
-  boot.kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ];
 
   makefu.server.primary-itf = "wlp3s0";
   makefu.full-populate = true;
diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 855fda952..2de32dd94 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -16,6 +16,8 @@ with import <stockholm/lib>;
     extraModulePackages = [
       config.boot.kernelPackages.acpi_call
     ];
+    # support backlight adjustment
+    kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ];
   };
 
   # configured media keys inside awesomerc

From 798e80de7c522afbf619ab4b1519849f2c33ca9b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:54:39 +0100
Subject: [PATCH 20/30] m 2 owncloud: do not use mysql

---
 makefu/2configs/deployment/owncloud.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index d692ef72d..c6fb9c8e5 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -131,11 +131,15 @@ in  {
     ( serveCloud [ "o.euer.krebsco.de" ] )
   ];
 
-  services.mysql = {
-    enable = true;
+  services.mysql = { # TODO: currently nextcloud uses sqlite
+    enable = false;
     package = pkgs.mariadb;
     rootPassword = config.krebs.secret.files.mysql_rootPassword.path;
   };
+  services.mysqlBackup = {
+    enable = false;
+    databases = [ "nextcloud" ];
+  };
 
   krebs.secret.files.mysql_rootPassword = {
     path = "${config.services.mysql.dataDir}/mysql_rootPassword";

From ab88b75e1d36078d6dbb104803b0421f84a2abe9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:55:02 +0100
Subject: [PATCH 21/30] m 2 urlwatch: watch exfat-nofuse

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

diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index d575d18bc..20eb031a1 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -16,6 +16,9 @@
       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
       https://github.com/amadvance/snapraid/releases.atom
       https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
+      https://api.github.com/repos/embray/d2to1/tags
+      https://api.github.com/repos/dorimanx/exfat-nofuse/commits
+      https://api.github.com/repos/dorimanx/exfat-nofuse/tags
     ];
   };
 }

From 7d6945babb1366099beaa453dc86a7410a55db3d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:55:22 +0100
Subject: [PATCH 22/30] m 5 default: auto-detect packages

---
 makefu/5pkgs/default.nix | 41 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 71354a015..25ae2fe4b 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -1,38 +1,35 @@
 { pkgs, ... }:
 
-let
-  inherit (pkgs) callPackage;
-in
+with import <stockholm/lib>;
 {
-  nixpkgs.config.packageOverrides = rec {
-    acdcli = callPackage ./acdcli {};
+  nixpkgs.config.packageOverrides = oldpkgs: let
+
+    # This callPackage will try to detect obsolete overrides.
+    callPackage = path: args: let
+      override = pkgs.callPackage path args;
+      upstream = optionalAttrs (override ? "name")
+        (oldpkgs.${(parseDrvName override.name).name} or {});
+    in if upstream ? "name" &&
+          override ? "name" &&
+          compareVersions upstream.name override.name != -1
+      then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
+      else override;
+
+  in {}
+  // mapAttrs (_: flip callPackage {})
+              (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
+                           (subdirsOf ./.))
+  // {
     alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
-    awesomecfg = callPackage ./awesomecfg {};
-    bintray-upload = callPackage ./bintray-upload {};
-    debmirror = callPackage ./debmirror {};
     inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
-    elchhub = callPackage ./elchhub {};
-    f3 = callPackage ./f3 {};
-    farpd = callPackage ./farpd {};
-    git-xlsx-textconv = callPackage ./git-xlsx-textconv {};
-    mergerfs = callPackage ./mergerfs {};
-    mycube-flask = callPackage ./mycube-flask {};
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
-    ps3netsrv = callPackage ./ps3netsrv {};
     pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils {
       wordset-file = pkgs.fetchurl {
         url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
         sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
       };
     };
-    qcma = pkgs.qt5.callPackage ./qcma {};
-    tw-upload-plugin = callPackage ./tw-upload-plugin {};
-    skytraq-logger = callPackage ./skytraq-logger {};
-    taskserver = callPackage ./taskserver {};
-    udpt = callPackage ./udpt {};
-    wol = callPackage ./wol {};
-    snapraid = callPackage ./snapraid {};
   };
 }

From 87cd7cd9afc1f28927f3b605f1fe97047eeaf18c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 16:23:12 +0100
Subject: [PATCH 23/30] m 2 tools: update

---
 makefu/2configs/tools/all.nix       | 5 +++--
 makefu/2configs/tools/core-gui.nix  | 1 -
 makefu/2configs/tools/core.nix      | 5 +++++
 makefu/2configs/tools/extra-gui.nix | 2 +-
 makefu/2configs/tools/games.nix     | 7 +++++++
 makefu/2configs/tools/media.nix     | 8 ++++----
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 makefu/2configs/tools/games.nix

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 09344d99d..e64e216e0 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -2,9 +2,10 @@
   imports = [
     ./core.nix
     ./core-gui.nix
-    ./extra-gui.nix
     ./dev.nix
-    ./sec.nix
+    ./extra-gui.nix
+    ./games.nix
     ./media.nix
+    ./sec.nix
   ];
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 518a60eac..654e83baa 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -16,7 +16,6 @@
     mirage
     tightvnc
     gnome3.dconf
-    vlc
     wireshark
     xdotool
     scrot
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 56d60812e..86d72c662 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -9,12 +9,14 @@
     at_spi2_core
     acpi
     bc
+    rsync
     exif
     file
     ntfs3g
     pv
     proot
     sshpass
+    populate
     usbutils
     p7zip
     hdparm
@@ -30,7 +32,10 @@
     wol
     tmux
     smartmontools
+    cifs-utils
     iftop
+    taskwarrior
+    mplayer
 
     cac-api
     cac-panel
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 6b8a5af66..9cfacf408 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -7,6 +7,6 @@
     skype
     virtmanager
     synergy
-    
+    saleae-logic
   ];
 }
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
new file mode 100644
index 000000000..34c686451
--- /dev/null
+++ b/makefu/2configs/tools/games.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    steam
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 67159a176..4fc3413e8 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
   krebs.per-user.makefu.packages = with pkgs; [
     kodi
     streamripper
+    youtube-dl
+    calibre
+    vlc
+    mumble
   ];
 }

From e495e59af040ba517843c572c4884f1434eefccb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Mar 2017 16:59:34 +0100
Subject: [PATCH 24/30] m 2 default: suid for sendmail

---
 makefu/2configs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 74d3635bd..bf70ebe08 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -159,7 +159,10 @@ with import <stockholm/lib>;
     auto-optimise-store = true
   '';
 
-  security.wrappers.sendmail.source = "${pkgs.exim}/bin/sendmail";
+  security.wrappers.sendmail = {
+    source = "${pkgs.exim}/bin/sendmail";
+    setuid = true;
+  };
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M

From ef300aeb9e2c9230ce47ff306d4f5e4b684d69f1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 22:02:47 +0100
Subject: [PATCH 25/30] m 2 default: timesyncd replaced ntp in defaults

---
 makefu/2configs/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index bf70ebe08..1ad7f0710 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -145,16 +145,13 @@ with import <stockholm/lib>;
     tinc = pkgs.tinc_pre;
   };
 
-  services.cron.enable = false;
-  services.nscd.enable = false;
-  services.ntp.enable = false;
-  services.timesyncd.enable = true;
-  services.ntp.servers = [
+   networking.timeServers = [
     "pool.ntp.org"
     "time.windows.com"
     "time.apple.com"
     "time.nist.gov"
   ];
+
   nix.extraOptions = ''
     auto-optimise-store = true
   '';

From cb48e9371a337d23e1f3f09b5d024ee60451d9d2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 22:03:20 +0100
Subject: [PATCH 26/30] m 2 tools: xbacklight

---
 makefu/2configs/tools/core-gui.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 654e83baa..6d62e92c0 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -18,7 +18,7 @@
     gnome3.dconf
     wireshark
     xdotool
+    xorg.xbacklight
     scrot
-    
   ];
 }

From ea303cfd559599463eab912277faed072ba82a0f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 6 Mar 2017 12:45:56 +0100
Subject: [PATCH 27/30] tv q: respect terminal width when printing calenders

---
 tv/5pkgs/q/default.nix | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/tv/5pkgs/q/default.nix b/tv/5pkgs/q/default.nix
index a3a7cd739..2e7aa5cf2 100644
--- a/tv/5pkgs/q/default.nix
+++ b/tv/5pkgs/q/default.nix
@@ -1,7 +1,19 @@
 { pkgs, ... }:
+with import <stockholm/lib>;
 let
   q-cal = let
-    # XXX 23 is the longest line of cal's output
+
+    # Maximum width of cal's output.
+    calwidth = 23;
+
+    # Number of space characters between two calendars.
+    hspace = 2;
+
+    # Return number of columns required to print n calenders side by side.
+    need_width = n:
+      assert n >= 1;
+      n * calwidth + (n - 1) * hspace;
+
     pad = ''{
       ${pkgs.gnused}/bin/sed '
             # rtrim
@@ -10,7 +22,7 @@ let
             # delete last empty line
             ''${/^$/d}
           ' \
-        | ${pkgs.gawk}/bin/awk '{printf "%-23s\n", $0}' \
+        | ${pkgs.gawk}/bin/awk '{printf "%-${toString calwidth}s\n", $0}' \
         | ${pkgs.gnused}/bin/sed '
               # colorize header
               1,2s/.*/&/
@@ -20,23 +32,31 @@ let
             '
     }'';
   in ''
+    cols=$(${pkgs.ncurses}/bin/tput cols)
     ${pkgs.coreutils}/bin/paste \
-        <(${pkgs.utillinux}/bin/cal -mw \
+        <(if test $cols -ge ${toString (need_width 3)}; then
+          ${pkgs.utillinux}/bin/cal -mw \
               $(${pkgs.coreutils}/bin/date +'%m %Y' -d 'last month') \
             | ${pad}
-        ) \
-        <(${pkgs.utillinux}/bin/cal -mw \
+        fi) \
+        <(if test $cols -ge ${toString (need_width 1)}; then
+          ${pkgs.utillinux}/bin/cal -mw \
             | ${pkgs.gnused}/bin/sed '
                 # colorize day of month
                 s/\(^\| \)'"$(${pkgs.coreutils}/bin/date +%e)"'\>/&/
               ' \
             | ${pad}
-        ) \
-        <(${pkgs.utillinux}/bin/cal -mw \
+        fi) \
+        <(if test $cols -ge ${toString (need_width 2)}; then
+          ${pkgs.utillinux}/bin/cal -mw \
               $(${pkgs.coreutils}/bin/date +'%m %Y' -d 'next month') \
             | ${pad}
-        ) \
-      | ${pkgs.gnused}/bin/sed 's/\t/  /g'
+        fi) \
+      | ${pkgs.gnused}/bin/sed '
+          s/^\t//
+          s/\t$//
+          s/\t/${lpad hspace " " ""}/g
+        '
   '';
 
   q-isodate = ''

From 0953240b832117aef4d2ee3cc9cb1ff0e606242e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 6 Mar 2017 13:11:21 +0100
Subject: [PATCH 28/30] tv pulse: talk about hijacking audio devices

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

diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 2a3b5cbc1..418551213 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -76,6 +76,9 @@ in
     };
   };
 
+  # TODO assert that pulse is the only user with "audio" in group/extraGroups
+  # otherwise the audio device can be hijacked while the pulse service restarts
+  # (e.g. when mpv is running) and then the service will fail.
   users = {
     groups.pulse.gid = config.users.users.pulse.uid;
     users.pulse = {

From c05db2409061f721ba454f4bf79e635ee13a6f11 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 7 Mar 2017 15:32:31 +0100
Subject: [PATCH 29/30] Revert "cd: hart eingeCACt"

This reverts commit 3607bd0832d0f47a4bf56cae7e4cb14f6e257bc9.
---
 krebs/3modules/tv/default.nix | 2 +-
 tv/1systems/cd.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 1220143a7..d44c322aa 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -85,7 +85,7 @@ with import <stockholm/lib>;
       };
       nets = {
         internet = {
-          ip4.addr = "64.137.177.226";
+          ip4.addr = "45.62.237.203";
           aliases = [
             "cd.i"
             "cd.krebsco.de"
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index b718d19b8..108006f34 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -16,11 +16,11 @@ with import <stockholm/lib>;
   networking = {
     interfaces.enp2s1.ip4 = singleton {
       address = let
-        addr = "64.137.177.226";
+        addr = "45.62.237.203";
       in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr;
       prefixLength = 24;
     };
-    defaultGateway = "64.137.177.1";
+    defaultGateway = "45.62.237.1";
     nameservers = ["8.8.8.8"];
   };
 

From c04b08ab7e7967038e5ce9b494aafbbfc206d307 Mon Sep 17 00:00:00 2001
From: nin <nineinchnade@gmail.com>
Date: Tue, 7 Mar 2017 17:38:03 +0100
Subject: [PATCH 30/30] n 2 nixpackages: 6651c72 -> 5b0c9d4

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

diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
index ad39848b6..9c3eafffd 100644
--- a/nin/2configs/nixpkgs.nix
+++ b/nin/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://github.com/nixos/nixpkgs;
-    ref = "6651c72";
+    ref = "5b0c9d4";
   };
 }