From 4fa913765646f9964637c1807d5125bac64fb9a8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 14:36:29 +0200
Subject: 1 lass mors: bump rev

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

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index e7f8d527..e1408b21 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -30,7 +30,7 @@
     deps = {
       nixpkgs = {
         url = https://github.com/Lassulus/nixpkgs;
-        rev = "961fd7b7a0f88dde7dac2f7a4c05ee4e1a25381d";
+        rev = "2044542cfe37ddbaa4de93d6e11650c9eb596142";
       };
       secrets = {
         url = "/home/lass/secrets/${config.krebs.build.host.name}";
-- 
cgit v1.2.3


From 8490f398d7fb3d48bc291fcef71d0f4a312f907d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 14:36:56 +0200
Subject: 1 lass mors: disable old powertop tuneable

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

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index e1408b21..c2c88e6d 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -128,7 +128,7 @@
     #VM writeback timeout
     echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs'
     #Autosuspend for USB device Broadcom Bluetooth Device [Broadcom Corp]
-    echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control'
+    #echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control'
     #Autosuspend for USB device Biometric Coprocessor
     echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control'
 
-- 
cgit v1.2.3


From 406754183b5b28b1093aedc73925224d9fdd0028 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 14:38:32 +0200
Subject: lass 2 base: reject on retiolum

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 095c7660..66f86ec7 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -134,6 +134,7 @@ with lib;
         { predicate = "-p icmp"; target = "ACCEPT"; precedence = 10000; }
         { predicate = "-i lo"; target = "ACCEPT"; precedence = 9999; }
         { predicate = "-p tcp --dport 22"; target = "ACCEPT"; precedence = 9998; }
+        { predicate = "-i retiolum"; target = "REJECT"; precedence = -10000; }
       ];
     };
   };
-- 
cgit v1.2.3


From ca4f1e08d54b39623f716e4ff0a49aaa74acb206 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 14:39:14 +0200
Subject: lass 2 base: (re)enable mail

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 66f86ec7..581e990e 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -39,6 +39,7 @@ with lib;
   krebs = {
     enable = true;
     search-domain = "retiolum";
+    exim-retiolum.enable = true;
   };
 
   nix.useChroot = true;
-- 
cgit v1.2.3


From de6564e5f5caf394db8fe22d1ecfee22cb6155d3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 15:35:27 +0200
Subject: krebs 5: add youtube-tools

---
 krebs/5pkgs/default.nix       |  1 +
 krebs/5pkgs/youtube-tools.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 krebs/5pkgs/youtube-tools.nix

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1e..062f0a51 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -13,4 +13,5 @@ pkgs //
   github-known_hosts = callPackage ./github-known_hosts.nix {};
   hashPassword = callPackage ./hashPassword.nix {};
   posix-array = callPackage ./posix-array.nix {};
+  youtube-tools = callPackage ./youtube-tools.nix {};
 }
diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
new file mode 100644
index 00000000..29142b8b
--- /dev/null
+++ b/krebs/5pkgs/youtube-tools.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, ... }:
+
+stdenv.mkDerivation {
+  name = "youtube-tools";
+
+  src = fetchgit {
+    url = https://github.com/Lassulus/the_playlist;
+    rev = "323a66775168b6addb3acddaee0a8ff227ea4bd4";
+    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin/
+  '';
+}
-- 
cgit v1.2.3


From f0bce7d3959ef1d438149cb00ac609ad3a92dfa1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 15:35:40 +0200
Subject: lass 1: bump rev

---
 lass/1systems/cloudkrebs.nix | 2 +-
 lass/1systems/mors.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 515810e4..6e814e64 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -30,7 +30,7 @@
     deps = {
       nixpkgs = {
         url = https://github.com/Lassulus/nixpkgs;
-        rev = "1879a011925c561f0a7fd4043da0768bbff41d0b";
+        rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90";
       };
       secrets = {
         url = "/home/lass/secrets/${config.krebs.build.host.name}";
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c2c88e6d..357ad16e 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -30,7 +30,7 @@
     deps = {
       nixpkgs = {
         url = https://github.com/Lassulus/nixpkgs;
-        rev = "2044542cfe37ddbaa4de93d6e11650c9eb596142";
+        rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90";
       };
       secrets = {
         url = "/home/lass/secrets/${config.krebs.build.host.name}";
-- 
cgit v1.2.3


From 7f11bbcfc0b0c53d9d2838d253d7bd48af8a4b7e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 16:18:57 +0200
Subject: krebs 5 youtube-tools: bump rev

---
 krebs/5pkgs/youtube-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
index 29142b8b..d767728b 100644
--- a/krebs/5pkgs/youtube-tools.nix
+++ b/krebs/5pkgs/youtube-tools.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://github.com/Lassulus/the_playlist;
-    rev = "323a66775168b6addb3acddaee0a8ff227ea4bd4";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
+    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
   };
 
   phases = [
-- 
cgit v1.2.3


From 0a634d3a993fbf787811130da7383e7ba4b4818a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 19 Aug 2015 17:54:11 +0200
Subject: krebs 3: make uriel secure

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

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index f143e64b..e508b919 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -272,6 +272,7 @@ let
             '';
           };
         };
+        secure = true;
       };
       mors = {
         cores = 2;
-- 
cgit v1.2.3


From 8be991434c07c07e6d2c89717e7ea87fbe0d6c12 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Aug 2015 15:54:58 +0200
Subject: Zhosts: add Port 53 to gum & flap

---
 Zhosts/flap | 1 +
 Zhosts/gum  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Zhosts/flap b/Zhosts/flap
index ea6aace5..8cce0dc9 100644
--- a/Zhosts/flap
+++ b/Zhosts/flap
@@ -1,4 +1,5 @@
 Subnet = 10.243.211.172
+Port = 53
 Subnet = 42:472a:3d01:bbe4:4425:567e:592b:065d
 
 -----BEGIN RSA PUBLIC KEY-----
diff --git a/Zhosts/gum b/Zhosts/gum
index 9749f975..8bf76f2a 100644
--- a/Zhosts/gum
+++ b/Zhosts/gum
@@ -1,4 +1,5 @@
 Address= 195.154.108.70
+Port = 53
 Subnet = 10.243.0.211
 Subnet = 42:f9f0:0000:0000:0000:0000:0000:70d2
 Aliases = paste
-- 
cgit v1.2.3


From 5a1a36e1f2038df9ef7663f6675a2080a796b579 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Aug 2015 15:57:12 +0200
Subject: krebs 3: fix uriel's email

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

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e508b919..3d34ddf1 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -308,7 +308,7 @@ let
       };
       uriel = {
         pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
-        mail = "uriel@mors.retiolum";
+        mail = "lass@uriel.retiolum";
       };
     };
   };
-- 
cgit v1.2.3


From ee74d4e5b866d36e9d54a9cbfe033155ae3356d8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Aug 2015 16:09:24 +0200
Subject: Zhosts: specify ports in new format

---
 Zhosts/flap                | 2 +-
 Zhosts/gum                 | 2 +-
 lass/2configs/retiolum.nix | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Zhosts/flap b/Zhosts/flap
index 8cce0dc9..94e6bdc7 100644
--- a/Zhosts/flap
+++ b/Zhosts/flap
@@ -1,5 +1,5 @@
 Subnet = 10.243.211.172
-Port = 53
+Subnet = 10.243.211.172 53
 Subnet = 42:472a:3d01:bbe4:4425:567e:592b:065d
 
 -----BEGIN RSA PUBLIC KEY-----
diff --git a/Zhosts/gum b/Zhosts/gum
index 8bf76f2a..f1eaa4ea 100644
--- a/Zhosts/gum
+++ b/Zhosts/gum
@@ -1,5 +1,5 @@
 Address= 195.154.108.70
-Port = 53
+Address= 195.154.108.70 53
 Subnet = 10.243.0.211
 Subnet = 42:f9f0:0000:0000:0000:0000:0000:70d2
 Aliases = paste
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 2d583a88..7c7f2b4d 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -22,6 +22,8 @@
       "fastpoke"
       "cloudkrebs"
       "pigstarter"
+      "gum"
+      "flap"
     ];
   };
 }
-- 
cgit v1.2.3


From 5113b24959e52fdab7b40a2f5674af56044cf94d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 22 Aug 2015 16:49:37 +0200
Subject: lass 2 base: disable ntp

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 581e990e..256c29ab 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -46,6 +46,9 @@ with lib;
 
   users.mutableUsers = false;
 
+  #why is this on in the first place?
+  services.ntp.enable = false;
+
   boot.tmpOnTmpfs = true;
   # see tmpfiles.d(5)
   systemd.tmpfiles.rules = [
-- 
cgit v1.2.3


From c9ecb538417d6d75542e56b77103b7679097b30f Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 23 Aug 2015 16:51:11 +0200
Subject: lass: add bitlbee-steam support

---
 lass/3modules/bitlbee.nix    | 153 +++++++++++++++++++++++++++++++++++++++++++
 lass/5pkgs/bitlbee-dev.nix   |  20 ++++++
 lass/5pkgs/bitlbee-steam.nix |  31 +++++++++
 lass/5pkgs/bitlbee.nix       |  71 ++++++++++++++++++++
 lass/5pkgs/default.nix       |  13 ++++
 5 files changed, 288 insertions(+)
 create mode 100644 lass/3modules/bitlbee.nix
 create mode 100644 lass/5pkgs/bitlbee-dev.nix
 create mode 100644 lass/5pkgs/bitlbee-steam.nix
 create mode 100644 lass/5pkgs/bitlbee.nix
 create mode 100644 lass/5pkgs/default.nix

diff --git a/lass/3modules/bitlbee.nix b/lass/3modules/bitlbee.nix
new file mode 100644
index 00000000..8ce56014
--- /dev/null
+++ b/lass/3modules/bitlbee.nix
@@ -0,0 +1,153 @@
+{ config, lib, pkgs, ... }:
+
+
+let
+
+  inherit (lib)
+    mkIf
+    mkOption
+    types
+    singleton
+  ;
+
+  authModeCheck = v:
+    v == "Open" ||
+    v == "Closed" ||
+    v == "Registered"
+  ;
+
+  bitlbeeConfig = pkgs.writeText "bitlbee.conf" ''
+    [settings]
+    RunMode = Daemon
+    User = bitlbee
+    ConfigDir = ${cfg.configDir}
+    DaemonInterface = ${cfg.interface}
+    DaemonPort = ${toString cfg.portNumber}
+    AuthMode = ${cfg.authMode}
+    ${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"}
+    ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
+    ${cfg.extraSettings}
+
+    [defaults]
+    ${cfg.extraDefaults}
+  '';
+
+  cfg = config.lass.bitlbee;
+
+  out = {
+    options.lass.bitlbee = api;
+    config = mkIf cfg.enable imp;
+  };
+
+  api = {
+    enable = mkOption {
+      default = false;
+      description = ''
+        Whether to run the BitlBee IRC to other chat network gateway.
+        Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
+        networks via an IRC client.
+      '';
+    };
+
+    interface = mkOption {
+      default = "127.0.0.1";
+      description = ''
+        The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
+        only clients on the local host can connect to it; if `0.0.0.0', clients
+        can access it from any network interface.
+      '';
+    };
+
+    portNumber = mkOption {
+      default = 6667;
+      description = ''
+        Number of the port BitlBee will be listening to.
+      '';
+    };
+
+    authMode = mkOption {
+      default = "Open";
+      type = types.addCheck types.str authModeCheck;
+      description = ''
+        The following authentication modes are available:
+          Open -- Accept connections from anyone, use NickServ for user authentication.
+          Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.
+          Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.
+      '';
+    };
+
+    hostName = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        Normally, BitlBee gets a hostname using getsockname(). If you have a nicer
+        alias for your BitlBee daemon, you can set it here and BitlBee will identify
+        itself with that name instead.
+      '';
+    };
+
+    configDir = mkOption {
+      default = "/var/lib/bitlbee";
+      type = types.path;
+      description = ''
+        Specify an alternative directory to store all the per-user configuration
+        files.
+      '';
+    };
+
+    protocols = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        This option allows to remove the support of protocol, even if compiled
+        in. If nothing is given, there are no restrictions.
+      '';
+    };
+
+    extraSettings = mkOption {
+      default = "";
+      description = ''
+        Will be inserted in the Settings section of the config file.
+      '';
+    };
+
+    extraDefaults = mkOption {
+      default = "";
+      description = ''
+        Will be inserted in the Default section of the config file.
+      '';
+    };
+
+    bitlbeePkg = mkOption {
+      default = pkgs.bitlbee;
+      description = ''
+        the bitlbee pkg to use.
+      '';
+    };
+  };
+
+  imp = {
+    users.extraUsers = singleton {
+      name = "bitlbee";
+      uid = config.ids.uids.bitlbee;
+      description = "BitlBee user";
+      home = "/var/lib/bitlbee";
+      createHome = true;
+    };
+
+    users.extraGroups = singleton {
+      name = "bitlbee";
+      gid = config.ids.gids.bitlbee;
+    };
+
+    systemd.services.bitlbee = {
+      description = "BitlBee IRC to other chat networks gateway";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.User = "bitlbee";
+      serviceConfig.ExecStart = "${cfg.bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
+    };
+  };
+
+in
+out
diff --git a/lass/5pkgs/bitlbee-dev.nix b/lass/5pkgs/bitlbee-dev.nix
new file mode 100644
index 00000000..dd129591
--- /dev/null
+++ b/lass/5pkgs/bitlbee-dev.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
+
+stdenv.mkDerivation rec {
+  name = "bitlbee-3.4.1";
+
+  src = fetchurl {
+    url = "mirror://bitlbee/src/${name}.tar.gz";
+    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
+  };
+
+  buildInputs = [ gnutls glib pkgconfig libotr python ];
+
+  buildPhase = "";
+
+  installPhase = ''
+    make install-dev
+  '';
+
+}
+
diff --git a/lass/5pkgs/bitlbee-steam.nix b/lass/5pkgs/bitlbee-steam.nix
new file mode 100644
index 00000000..d869eaac
--- /dev/null
+++ b/lass/5pkgs/bitlbee-steam.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, autoconf, automake, bitlbee-dev, glib, libgcrypt, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "bitlbee-steam-1.3.1";
+
+  src = fetchgit {
+    url = "https://github.com/jgeboski/bitlbee-steam";
+    rev = "439d777c7e8d06712ffc15c3e51d61799f4c0d0c";
+    sha256 = "493924da1083a3b23073c595a9e1989a7ae09a196524ad66ca99c4d8ccc20d2a";
+  };
+
+  buildInputs = [
+    autoconf
+    automake
+    bitlbee-dev
+    glib
+    libgcrypt
+    libtool
+    pkgconfig
+  ];
+
+  configurePhase = ''
+    ./autogen.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp steam/.libs/steam.la $out/
+    cp steam/.libs/steam.so $out/
+  '';
+}
diff --git a/lass/5pkgs/bitlbee.nix b/lass/5pkgs/bitlbee.nix
new file mode 100644
index 00000000..2a5a8d86
--- /dev/null
+++ b/lass/5pkgs/bitlbee.nix
@@ -0,0 +1,71 @@
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python
+  , bitlbee-facebook ? null
+  , bitlbee-steam ? null
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "bitlbee-3.4.1";
+
+  src = fetchurl {
+    url = "mirror://bitlbee/src/${name}.tar.gz";
+    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
+  };
+
+
+  buildInputs = [ gnutls glib pkgconfig libotr python ]
+    ++ optional doCheck check;
+
+  configureFlags = [
+    "--gcov=1"
+    "--otr=1"
+    "--ssl=gnutls"
+  ];
+
+  postBuild = ''
+    ${if (bitlbee-steam != null) then
+      ''
+        mkdir -p $out/lib/bitlbee/
+        find ${bitlbee-steam}
+        cp ${bitlbee-steam}/* $out/lib/bitlbee/
+      ''
+    else
+      ""
+    }
+  '';
+    #${concatMapStringsSep "\n" ([] ++
+    #  (if (bitlbee-facebook != null) then
+    #    "cp ${bitlbee-faceook}/* $out/"
+    #  else
+    #    ""
+    #  ) ++
+    #  (if (bitlbee-steam != null) then
+    #    "cp ${bitlbee-steam}/* $out/"
+    #  else
+    #    ""
+    #  )
+    #)}
+
+  doCheck = true;
+
+  meta = {
+    description = "IRC instant messaging gateway";
+
+    longDescription = ''
+      BitlBee brings IM (instant messaging) to IRC clients.  It's a
+      great solution for people who have an IRC client running all the
+      time and don't want to run an additional MSN/AIM/whatever
+      client.
+
+      BitlBee currently supports the following IM networks/protocols:
+      XMPP/Jabber (including Google Talk), MSN Messenger, Yahoo!
+      Messenger, AIM and ICQ.
+    '';
+
+    homepage = http://www.bitlbee.org/;
+    license = licenses.gpl2Plus;
+
+    maintainers = with maintainers; [ wkennington pSub ];
+    platforms = platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
new file mode 100644
index 00000000..c776262f
--- /dev/null
+++ b/lass/5pkgs/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+let
+  inherit (pkgs) callPackage;
+  kpkgs = import ../../krebs/5pkgs { inherit pkgs; };
+in
+
+kpkgs //
+rec {
+  bitlbee-dev = callPackage ./bitlbee-dev.nix {};
+  bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
+  bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
+}
-- 
cgit v1.2.3


From 8247a5a618d6b0fc3688077fe36508b8bf88dcc3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 23 Aug 2015 16:51:51 +0200
Subject: lass 2: add bitlbee

---
 lass/1systems/mors.nix    |  3 ++-
 lass/2configs/bitlbee.nix | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 lass/2configs/bitlbee.nix

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 357ad16e..19d7030d 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -15,12 +15,13 @@
     ../2configs/wine.nix
     ../2configs/texlive.nix
     ../2configs/binary-caches.nix
-    ../2configs/ircd.nix
+    #../2configs/ircd.nix
     ../2configs/chromium-patched.nix
     ../2configs/new-repos.nix
     #../../2configs/tv/synaptics.nix
     ../2configs/retiolum.nix
     ../2configs/wordpress.nix
+    ../2configs/bitlbee.nix
   ];
 
   krebs.build = {
diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix
new file mode 100644
index 00000000..3a008040
--- /dev/null
+++ b/lass/2configs/bitlbee.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+let
+  lpkgs = import ../5pkgs { inherit pkgs; };
+in {
+
+  imports = [
+    ../3modules/bitlbee.nix
+  ];
+
+  config.lass.bitlbee = {
+    enable = true;
+    bitlbeePkg = lpkgs.bitlbee;
+  };
+}
-- 
cgit v1.2.3


From 2db4f7f0af42800aa7a9ae7fc70cd1f1a5d03dab Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 24 Aug 2015 13:21:42 +0200
Subject: lass 2 new-repos: allow secret collaborateurs

---
 lass/2configs/new-repos.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lass/2configs/new-repos.nix b/lass/2configs/new-repos.nix
index 64e9a7f1..026f9a66 100644
--- a/lass/2configs/new-repos.nix
+++ b/lass/2configs/new-repos.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with import ../../tv/4lib { inherit lib pkgs; };
+
 let
 
   out = {
@@ -8,14 +9,14 @@ let
       enable = true;
       root-title = "public repositories at ${config.krebs.build.host.name}";
       root-desc = "keep calm and engage";
-      inherit repos rules;
+      repos = mapAttrs (_: s: removeAttrs s ["collaborators"]) repos;
+      rules = rules;
     };
   };
 
-  repos = mapAttrs (_: s: removeAttrs s ["collaborators"]) (
+  repos =
     public-repos //
-    optionalAttrs config.krebs.build.host.secure restricted-repos
-  );
+    optionalAttrs config.krebs.build.host.secure restricted-repos;
 
   rules = concatMap make-rules (attrValues repos);
 
@@ -50,8 +51,8 @@ let
     };
   };
 
-  make-restricted-repo = name: { desc ? null, ... }: {
-    inherit name desc;
+  make-restricted-repo = name: { collaborators ? [], desc ? null, ... }: {
+    inherit name collaborators desc;
     public = false;
   };
 
-- 
cgit v1.2.3


From 75aad3ac9680a5fb6fcf9f8002639cf64935bf45 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 24 Aug 2015 15:50:39 +0200
Subject: lass: move nixpkgs.rev to base

---
 lass/1systems/cloudkrebs.nix | 4 ----
 lass/1systems/mors.nix       | 4 ----
 lass/1systems/uriel.nix      | 4 ----
 lass/2configs/base.nix       | 4 ++++
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 6e814e64..7c95e0f8 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -28,10 +28,6 @@
     target = "root@cloudkrebs";
     host = config.krebs.hosts.cloudkrebs;
     deps = {
-      nixpkgs = {
-        url = https://github.com/Lassulus/nixpkgs;
-        rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90";
-      };
       secrets = {
         url = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 19d7030d..d07fe14d 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -29,10 +29,6 @@
     target = "root@mors";
     host = config.krebs.hosts.mors;
     deps = {
-      nixpkgs = {
-        url = https://github.com/Lassulus/nixpkgs;
-        rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90";
-      };
       secrets = {
         url = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 041b891b..7c3d0812 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -28,10 +28,6 @@ with builtins;
     target = "root@uriel";
     host = config.krebs.hosts.uriel;
     deps = {
-      nixpkgs = {
-        url = https://github.com/Lassulus/nixpkgs;
-        rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90";
-      };
       secrets = {
         url = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 256c29ab..d44a19c1 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -40,6 +40,10 @@ with lib;
     enable = true;
     search-domain = "retiolum";
     exim-retiolum.enable = true;
+    build.deps.nixpkgs = {
+      url = https://github.com/Lassulus/nixpkgs;
+      rev = "58a82ff50b8605b88a8f66481d8c85bf8ab53be3";
+    };
   };
 
   nix.useChroot = true;
-- 
cgit v1.2.3


From 8063be1b3798a3aa8f488dd7025adc6adcdf013b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 24 Aug 2015 15:51:08 +0200
Subject: install only texLive

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

diff --git a/lass/2configs/texlive.nix b/lass/2configs/texlive.nix
index 295df31c..18d72297 100644
--- a/lass/2configs/texlive.nix
+++ b/lass/2configs/texlive.nix
@@ -2,6 +2,6 @@
 
 {
   environment.systemPackages = with pkgs; [
-    (pkgs.texLiveAggregationFun { paths = [ pkgs.texLive pkgs.texLiveFull ]; })
+    texLive
   ];
 }
-- 
cgit v1.2.3


From 36c79341f75bd13b78ce86383bec6c19b86fc25a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 24 Aug 2015 15:51:45 +0200
Subject: lass 2 virtualbox: new api call

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

diff --git a/lass/2configs/virtualbox.nix b/lass/2configs/virtualbox.nix
index 02620312..ad7ac142 100644
--- a/lass/2configs/virtualbox.nix
+++ b/lass/2configs/virtualbox.nix
@@ -4,7 +4,7 @@ let
   mainUser = config.users.extraUsers.mainUser;
 
 in {
-  services.virtualboxHost.enable = true;
+  virtualisation.virtualbox.host.enable = true;
 
   users.extraUsers = {
     virtual = {
-- 
cgit v1.2.3


From e8da585cfaf78e060d62df0d0bc7dbd9720496c3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 27 Aug 2015 20:35:50 +0200
Subject: krebs pkgs nq: init at 0eae839cb1

---
 krebs/5pkgs/default.nix |  1 +
 krebs/5pkgs/nq.nix      | 16 ++++++++++++++++
 tv/1systems/wu.nix      |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 krebs/5pkgs/nq.nix

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1e..2149b6f1 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,5 +12,6 @@ pkgs //
   github-hosts-sync = callPackage ./github-hosts-sync.nix {};
   github-known_hosts = callPackage ./github-known_hosts.nix {};
   hashPassword = callPackage ./hashPassword.nix {};
+  nq = callPackage ./nq.nix {};
   posix-array = callPackage ./posix-array.nix {};
 }
diff --git a/krebs/5pkgs/nq.nix b/krebs/5pkgs/nq.nix
new file mode 100644
index 00000000..0f397a43
--- /dev/null
+++ b/krebs/5pkgs/nq.nix
@@ -0,0 +1,16 @@
+{ fetchgit, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "nq-${rev}";
+  rev = "0eae839cb1";
+
+  src = fetchgit {
+    url = https://github.com/chneukirchen/nq;
+    inherit rev;
+    sha256 = "1150274750cde934932d65bd6053d7a0ba2404a59eadfb87fc6bd8a4fb70febb";
+  };
+
+  configurePhase = ''
+    sed -i "s:^PREFIX=.*:PREFIX=$out:" Makefile
+  '';
+}
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 2233b48d..e48da90a 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -92,6 +92,7 @@ in
         tmux
         tvpkgs.cac
         tvpkgs.dic
+        tvpkgs.nq
         zathura
 
         #ack
-- 
cgit v1.2.3


From 0714ed3ea6c889c0576edd8075dc7c2b50d3e8b5 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 27 Aug 2015 20:40:39 +0200
Subject: tv charybdis: disable_auth = yes

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

diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix
index bf45bf29..a2952219 100644
--- a/tv/2configs/charybdis.nix
+++ b/tv/2configs/charybdis.nix
@@ -590,6 +590,7 @@ let
       throttle_count = 4;
       max_ratelimit_tokens = 30;
       away_interval = 30;
+      disable_auth = yes;
     };
 
     modules {
-- 
cgit v1.2.3


From fb41fe76c6fb0b460498228032f1fdbd7290ae46 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 28 Aug 2015 16:30:11 +0200
Subject: lass 3: add per-user

---
 lass/3modules/per-user.nix | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 lass/3modules/per-user.nix

diff --git a/lass/3modules/per-user.nix b/lass/3modules/per-user.nix
new file mode 100644
index 00000000..98d6339d
--- /dev/null
+++ b/lass/3modules/per-user.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with builtins;
+with lib;
+let
+  cfg = config.lass.per-user;
+
+  out = {
+    options.lass.per-user = api;
+    config = imp;
+  };
+
+  api = mkOption {
+    type = with types; attrsOf (submodule {
+      options = {
+        packages = mkOption {
+          type = listOf path;
+          default = [];
+        };
+      };
+    });
+    default = {};
+  };
+
+  imp = {
+    #
+    # TODO only shellInit and use well-known paths
+    #
+    environment.shellInit = ''
+      if test -e ${user-profiles}/"$LOGNAME"; then
+        . ${user-profiles}/"$LOGNAME"
+      fi
+    '';
+    environment.interactiveShellInit = ''
+      if test -e ${user-profiles}/"$LOGNAME"; then
+        . ${user-profiles}/"$LOGNAME"
+      fi
+    '';
+    environment.profileRelativeEnvVars.PATH = mkForce [ "/bin" ];
+  };
+
+  user-profiles = pkgs.runCommand "user-profiles" {} ''
+    mkdir $out
+    ${concatStrings (mapAttrsToList (logname: { packages, ... }: ''
+      cat > $out/${logname} <<\EOF
+      ${optionalString (length packages > 0) (
+        let path = makeSearchPath "bin" packages; in
+        ''export PATH="$PATH":${escapeShellArg path}''
+      )}
+      EOF
+    '') cfg)}
+  '';
+
+in out
-- 
cgit v1.2.3


From bf69b0c03f1e380b127815c2263f1dac5c9d9165 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 28 Aug 2015 16:30:36 +0200
Subject: lass 4: add simpleScript

---
 lass/4lib/default.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 lass/4lib/default.nix

diff --git a/lass/4lib/default.nix b/lass/4lib/default.nix
new file mode 100644
index 00000000..21a083d1
--- /dev/null
+++ b/lass/4lib/default.nix
@@ -0,0 +1,20 @@
+{ lib, pkgs, ... }:
+
+let
+  krebs = import ../../krebs/4lib { inherit lib; };
+in
+
+with krebs;
+
+krebs // rec {
+
+  simpleScript = name: content:
+    pkgs.stdenv.mkDerivation {
+      inherit name;
+      phases = [ "installPhase" ];
+      installPhase = ''
+        mkdir -p $out/bin
+        ln -s ${pkgs.writeScript name content} $out/bin/${name}
+      '';
+    };
+}
-- 
cgit v1.2.3


From ecae9b59753c13ea5bff57a6f7c44086c77844d6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 28 Aug 2015 16:31:05 +0200
Subject: lass 2 browsers: refactor

---
 lass/2configs/browsers.nix | 93 +++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 55 deletions(-)

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 8aecea92..9849c829 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -1,67 +1,50 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
+  inherit (import ../4lib { inherit pkgs lib; }) simpleScript;
+
   mainUser = config.users.extraUsers.mainUser;
+  createBrowserUser = name: extraGroups: packages:
+    {
+      users.extraUsers = {
+        ${name} = {
+          inherit name;
+          inherit extraGroups;
+          home = "/home/${name}";
+          useDefaultShell = true;
+          createHome = true;
+        };
+      };
+      lass.per-user.${name}.packages = packages;
+      security.sudo.extraConfig = ''
+        ${mainUser.name} ALL=(${name}) NOPASSWD: ALL
+      '';
+      environment.systemPackages = [
+        (simpleScript name ''
+          sudo -u ${name} -i chromium $@
+        '')
+      ];
+    };
 
 in {
 
-  nixpkgs.config.packageOverrides = pkgs : {
-    chromium = pkgs.chromium.override {
-      pulseSupport = true;
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    firefox
+  imports = [
+    ../3modules/per-user.nix
+  ] ++ [
+    ( createBrowserUser "ff" [ "audio" ] [ pkgs.firefox ] )
+    ( createBrowserUser "cr" [ "audio" ] [ pkgs.chromium ] )
+    ( createBrowserUser "fb" [ ] [ pkgs.chromium ] )
+    ( createBrowserUser "gm" [ ] [ pkgs.chromium ] )
+    ( createBrowserUser "flash" [ ] [ pkgs.flash ] )
   ];
 
-  users.extraUsers = {
-    firefox = {
-      name = "firefox";
-      description = "user for running firefox";
-      home = "/home/firefox";
-      useDefaultShell = true;
-      extraGroups = [ "audio" ];
-      createHome = true;
-    };
-    chromium = {
-      name = "chromium";
-      description = "user for running chromium";
-      home = "/home/chromium";
-      useDefaultShell = true;
-      extraGroups = [ "audio" ];
-      createHome = true;
-    };
-    facebook = {
-      name = "facebook";
-      description = "user for running facebook in chromium";
-      home = "/home/facebook";
-      useDefaultShell = true;
-      extraGroups = [ "audio" ];
-      createHome = true;
-    };
-    google = {
-      name = "google";
-      description = "user for running google+/gmail in chromium";
-      home = "/home/google";
-      useDefaultShell = true;
-      createHome = true;
+  nixpkgs.config.packageOverrides = pkgs : {
+    flash = pkgs.chromium.override {
+      pulseSupport = true;
+      enablePepperFlash = true;
     };
-    flash = {
-      name = "flash";
-      description = "user for running flash stuff";
-      home = "/home/flash";
-      useDefaultShell = true;
-      extraGroups = [ "audio" ];
-      createHome = true;
+    chromium = pkgs.chromium.override {
+      pulseSupport = true;
     };
   };
-
-  security.sudo.extraConfig = ''
-    ${mainUser.name} ALL=(firefox) NOPASSWD: ALL
-    ${mainUser.name} ALL=(chromium) NOPASSWD: ALL
-    ${mainUser.name} ALL=(facebook) NOPASSWD: ALL
-    ${mainUser.name} ALL=(google) NOPASSWD: ALL
-    ${mainUser.name} ALL=(flash) NOPASSWD: ALL
-  '';
 }
-- 
cgit v1.2.3


From 015720ef89b81d3d17b3aa7dcaa1e1489c0f87a8 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 20:09:54 +0200
Subject: {tv/4lib shell-escape,krebs/4lib/shell.nix escape}

---
 krebs/4lib/default.nix |  1 +
 krebs/4lib/shell.nix   | 15 +++++++++++++++
 tv/4lib/default.nix    |  9 +--------
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 krebs/4lib/shell.nix

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index b6758533..8b587dfb 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -14,5 +14,6 @@ builtins // lib // rec {
 
   dns = import ./dns.nix { inherit lib; };
   listset = import ./listset.nix { inherit lib; };
+  shell = import ./shell.nix { inherit lib; };
   tree = import ./tree.nix { inherit lib; };
 }
diff --git a/krebs/4lib/shell.nix b/krebs/4lib/shell.nix
new file mode 100644
index 00000000..48b220f8
--- /dev/null
+++ b/krebs/4lib/shell.nix
@@ -0,0 +1,15 @@
+{ lib, ... }:
+
+with builtins;
+with lib;
+
+rec {
+  escape =
+    let
+      isSafeChar = c: match "[-./0-9_a-zA-Z]" c != null;
+    in
+    stringAsChars (c:
+      if isSafeChar c then c
+      else if c == "\n" then "'\n'"
+      else "\\${c}");
+}
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index 352689af..106535ba 100644
--- a/tv/4lib/default.nix
+++ b/tv/4lib/default.nix
@@ -16,12 +16,5 @@ krebs // rec {
   # "7.4.335" -> "74"
   majmin = with lib; x : concatStrings (take 2 (splitString "." x));
 
-  shell-escape =
-    let
-      isSafeChar = c: match "[-./0-9_a-zA-Z]" c != null;
-    in
-    stringAsChars (c:
-      if isSafeChar c then c
-      else if c == "\n" then "'\n'"
-      else "\\${c}");
+  shell-escape = krebs.shell.escape;
 }
-- 
cgit v1.2.3


From f6997378c91be84432703183397f8675143030e9 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 20:11:03 +0200
Subject: krebs shell: add cat

---
 krebs/4lib/shell.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/krebs/4lib/shell.nix b/krebs/4lib/shell.nix
index 48b220f8..2a6da5c1 100644
--- a/krebs/4lib/shell.nix
+++ b/krebs/4lib/shell.nix
@@ -12,4 +12,11 @@ rec {
       if isSafeChar c then c
       else if c == "\n" then "'\n'"
       else "\\${c}");
+
+  #
+  # shell script generators
+  #
+
+  # example: "${cat (toJSON { foo = "bar"; })} | jq -r .foo"
+  cat = s: "printf '%s' ${escape s}";
 }
-- 
cgit v1.2.3


From c1aaaca7f7febe0c587342ae74e7045bb9a67c5a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 21:31:59 +0200
Subject: krebs += pkgs.writeC lib.toC

---
 krebs/4lib/default.nix      |  6 ++++++
 krebs/5pkgs/default.nix     | 13 ++++++++++++-
 tv/1systems/wu.nix          |  2 +-
 tv/2configs/mail-client.nix |  4 ++--
 tv/5pkgs/default.nix        |  4 ++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 8b587dfb..ca7219c7 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -16,4 +16,10 @@ builtins // lib // rec {
   listset = import ./listset.nix { inherit lib; };
   shell = import ./shell.nix { inherit lib; };
   tree = import ./tree.nix { inherit lib; };
+
+  toC = x: {
+    list = "{ ${concatStringsSep ", " (map toC x)} }";
+    null = "NULL";
+    string = toJSON x; # close enough
+  }.${typeOf x};
 }
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 2149b6f1..c8fb1d2d 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   inherit (pkgs) callPackage;
@@ -14,4 +14,15 @@ pkgs //
   hashPassword = callPackage ./hashPassword.nix {};
   nq = callPackage ./nq.nix {};
   posix-array = callPackage ./posix-array.nix {};
+
+  writeC = name: {}: src: pkgs.runCommand name {} ''
+    PATH=${lib.makeSearchPath "bin" (with pkgs; [
+      binutils
+      coreutils
+      gcc
+    ])}
+    in=${pkgs.writeText "${name}.c" src}
+    gcc -O -Wall -o $out $in
+    strip --strip-unneeded $out
+  '';
 }
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index e48da90a..6131897a 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  tvpkgs = import ../5pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit lib pkgs; };
 in
 
 {
diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix
index a632cf7c..1daacdb4 100644
--- a/tv/2configs/mail-client.nix
+++ b/tv/2configs/mail-client.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
-with import ../5pkgs { inherit pkgs; };
+with import ../5pkgs { inherit lib pkgs; };
 
 {
   environment.systemPackages = [
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 7b5d10a6..a0a22df9 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   inherit (pkgs) callPackage;
-  kpkgs = import ../../krebs/5pkgs { inherit pkgs; };
+  kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; };
 in
 
 kpkgs // {
-- 
cgit v1.2.3


From 8827469a35852a0623d8353c22b481a15328254a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 21:43:16 +0200
Subject: krebs pkgs += execve

---
 krebs/5pkgs/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c8fb1d2d..406bd15e 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,11 +1,13 @@
 { lib, pkgs, ... }:
 
+with import ../4lib { inherit lib; };
+
 let
   inherit (pkgs) callPackage;
 in
 
 pkgs //
-{
+rec {
   cac = callPackage ./cac.nix {};
   dic = callPackage ./dic.nix {};
   genid = callPackage ./genid.nix {};
@@ -15,6 +17,20 @@ pkgs //
   nq = callPackage ./nq.nix {};
   posix-array = callPackage ./posix-array.nix {};
 
+  execve = name: { filename, argv, envp }:
+    writeC name {} ''
+      #include <unistd.h>
+      int main () {
+        const char *filename = ${toC filename};
+        char *const argv[] = ${toC (argv ++ [null])};
+        char *const envp[] = ${toC (
+          mapAttrsToList (k: v: "${k}=${v}") envp ++ [null]
+        )};
+        execve(filename, argv, envp);
+        return -1;
+      }
+    '';
+
   writeC = name: {}: src: pkgs.runCommand name {} ''
     PATH=${lib.makeSearchPath "bin" (with pkgs; [
       binutils
-- 
cgit v1.2.3


From 62865ae6ae46e006cea7ee80b931fc5be27d3449 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 21:48:29 +0200
Subject: tv configs test: init

---
 tv/1systems/wu.nix   |  1 +
 tv/2configs/test.nix | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 tv/2configs/test.nix

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 6131897a..34ba5651 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -33,6 +33,7 @@ in
     ../2configs/mail-client.nix
     ../2configs/xserver.nix
     ../2configs/synaptics.nix # TODO w110er if xserver is enabled
+    ../2configs/test.nix
     ../2configs/urlwatch.nix
     {
       environment.systemPackages = with pkgs; [
diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix
new file mode 100644
index 00000000..f96b9e98
--- /dev/null
+++ b/tv/2configs/test.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with import ../4lib { inherit lib pkgs; };
+
+let
+  tvpkgs = import ../5pkgs { inherit lib pkgs; };
+
+  out = {
+    security.sudo.extraConfig = ''
+      tv ALL=(test) NOPASSWD: ALL
+    '';
+    users.extraUsers.test = {
+      shell = "${test-shell}";
+    };
+  };
+
+  test-shell = tvpkgs.execve "test-shell" rec {
+    filename = "${pkgs.bash}/bin/bash";
+    argv = ["sh" "--noprofile" "-l"];
+    envp.ENV = pkgs.writeText "test-env" ''
+      ${shell.cat "Hello, `$(j0w\nd0g!)`!\\o/\n"} >&2
+    '';
+  };
+
+in out
-- 
cgit v1.2.3


From 642c761bd015f5766a75cf5688b50d42efdb96c3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 22:13:17 +0200
Subject: krebs pkgs += execveBin

---
 krebs/5pkgs/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 3658c43e..54604382 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -18,8 +18,8 @@ rec {
   posix-array = callPackage ./posix-array.nix {};
   youtube-tools = callPackage ./youtube-tools.nix {};
 
-  execve = name: { filename, argv, envp }:
-    writeC name {} ''
+  execve = name: { filename, argv, envp ? {}, destination ? "" }:
+    writeC name { inherit destination; } ''
       #include <unistd.h>
       int main () {
         const char *filename = ${toC filename};
@@ -32,14 +32,18 @@ rec {
       }
     '';
 
-  writeC = name: {}: src: pkgs.runCommand name {} ''
+  execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });
+
+  writeC = name: { destination ? "" }: src: pkgs.runCommand name {} ''
     PATH=${lib.makeSearchPath "bin" (with pkgs; [
       binutils
       coreutils
       gcc
     ])}
-    in=${pkgs.writeText "${name}.c" src}
-    gcc -O -Wall -o $out $in
-    strip --strip-unneeded $out
+    src=${pkgs.writeText "${name}.c" src}
+    exe=$out${destination}
+    mkdir -p "$(dirname "$exe")"
+    gcc -O -Wall -o "$exe" $src
+    strip --strip-unneeded "$exe"
   '';
 }
-- 
cgit v1.2.3


From 8e5137481852df6fb5488296a7081b5180e6954f Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 22:14:34 +0200
Subject: tv configs test: systemPackages += su-test

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

diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix
index f96b9e98..fa556ec7 100644
--- a/tv/2configs/test.nix
+++ b/tv/2configs/test.nix
@@ -6,6 +6,9 @@ let
   tvpkgs = import ../5pkgs { inherit lib pkgs; };
 
   out = {
+    environment.systemPackages = [
+      su-test
+    ];
     security.sudo.extraConfig = ''
       tv ALL=(test) NOPASSWD: ALL
     '';
@@ -14,6 +17,11 @@ let
     };
   };
 
+  su-test = tvpkgs.execveBin "su-test" rec {
+    filename = "/var/setuid-wrappers/sudo";
+    argv = ["sudo" "-u" "test" "-i"];
+  };
+
   test-shell = tvpkgs.execve "test-shell" rec {
     filename = "${pkgs.bash}/bin/bash";
     argv = ["sh" "--noprofile" "-l"];
-- 
cgit v1.2.3


From 144fcda288eb050153620c386511c7722e031029 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 22:27:23 +0200
Subject: {tv,krebs}: import krebs pkgs with lib

---
 krebs/3modules/github-hosts-sync.nix | 2 +-
 tv/1systems/cd.nix                   | 2 +-
 tv/2configs/charybdis.nix            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 0274b9d1..207b937d 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github-hosts-sync.nix
@@ -78,6 +78,6 @@ let
     uid = 3220554646; # genid github-hosts-sync
   };
 
-  kpkgs = import ../../krebs/5pkgs { inherit pkgs; };
+  kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; };
 in
 out
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 9f412d9b..8d6ac957 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  tvpkgs = import ../5pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit lib pkgs; };
 in
 
 {
diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix
index a2952219..6be6c02c 100644
--- a/tv/2configs/charybdis.nix
+++ b/tv/2configs/charybdis.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  tvpkgs = import ../5pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit lib pkgs; };
 in
 
 with builtins;
-- 
cgit v1.2.3


From 81eaf7a9e7b083c169828590d0d848cf933b32e0 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:17:25 +0200
Subject: one pkgs to rule them all

---
 default.nix                          | 6 ++++++
 krebs/3modules/github-hosts-sync.nix | 6 ++----
 krebs/5pkgs/default.nix              | 1 -
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 59a76f81..875f0d5b 100644
--- a/default.nix
+++ b/default.nix
@@ -8,6 +8,12 @@ let
       "${user-name}/1systems/${system-name}.nix"
       "${user-name}/3modules"
       "krebs/3modules"
+    ] ++ [
+      ({ lib, pkgs, ... }: {
+       _module.args.pkgs =
+         (import ./krebs/5pkgs { inherit lib pkgs; }) //
+         (import (./. + "/${user-name}/5pkgs") { inherit lib pkgs; });
+      })
     ];
   };
 
diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 207b937d..dbc0cc1d 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github-hosts-sync.nix
@@ -61,9 +61,9 @@ let
             ${cfg.ssh-identity-file} \
             "$ssh_identity_file_target"
 
-          ln -snf ${kpkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
+          ln -snf ${pkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
         '';
-        ExecStart = "${kpkgs.github-hosts-sync}/bin/github-hosts-sync";
+        ExecStart = "${pkgs.github-hosts-sync}/bin/github-hosts-sync";
       };
     };
 
@@ -77,7 +77,5 @@ let
     name = "github-hosts-sync";
     uid = 3220554646; # genid github-hosts-sync
   };
-
-  kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; };
 in
 out
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 54604382..2f7a24ed 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -6,7 +6,6 @@ let
   inherit (pkgs) callPackage;
 in
 
-pkgs //
 rec {
   cac = callPackage ./cac.nix {};
   dic = callPackage ./dic.nix {};
-- 
cgit v1.2.3


From 09257f97823e9a57cda749c2d5a69b18ef484cec Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:19:52 +0200
Subject: tv: use only pkgs

---
 tv/1systems/cd.nix          |  6 +-----
 tv/1systems/wu.nix          | 16 ++++++----------
 tv/2configs/charybdis.nix   |  6 +-----
 tv/2configs/mail-client.nix |  5 ++---
 tv/2configs/test.nix        |  6 ++----
 tv/5pkgs/default.nix        |  5 ++---
 6 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 8d6ac957..0049387b 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -2,10 +2,6 @@
 
 with lib;
 
-let
-  tvpkgs = import ../5pkgs { inherit lib pkgs; };
-in
-
 {
   krebs.build.host = config.krebs.hosts.cd;
   krebs.build.user = config.krebs.users.tv;
@@ -136,7 +132,7 @@ in
         server-names = singleton "viljetic.de";
         # TODO directly set root (instead via location)
         locations = singleton (nameValuePair "/" ''
-          root ${tvpkgs.viljetic-pages};
+          root ${pkgs.viljetic-pages};
         '');
       };
     }
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 34ba5651..622fd721 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -2,10 +2,6 @@
 
 with lib;
 
-let
-  tvpkgs = import ../5pkgs { inherit lib pkgs; };
-in
-
 {
   krebs.build.host = config.krebs.hosts.wu;
   krebs.build.user = config.krebs.users.tv;
@@ -39,12 +35,12 @@ in
       environment.systemPackages = with pkgs; [
 
         # stockholm
+        genid
         git
         gnumake
+        hashPassword
+        lentil
         parallel
-        tvpkgs.genid
-        tvpkgs.hashPassword
-        tvpkgs.lentil
         (pkgs.writeScriptBin "ff" ''
           #! ${pkgs.bash}/bin/bash
           exec sudo -u ff -i <<EOF
@@ -72,6 +68,8 @@ in
         # tv
         bc
         bind # dig
+        cac
+        dic
         file
         gitAndTools.qgit
         gnupg21
@@ -84,6 +82,7 @@ in
         netcat
         nix-repl
         nmap
+        nq
         p7zip
         pavucontrol
         posix_man_pages
@@ -91,9 +90,6 @@ in
         sxiv
         texLive
         tmux
-        tvpkgs.cac
-        tvpkgs.dic
-        tvpkgs.nq
         zathura
 
         #ack
diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix
index 6be6c02c..a949026d 100644
--- a/tv/2configs/charybdis.nix
+++ b/tv/2configs/charybdis.nix
@@ -1,9 +1,5 @@
 { config, lib, pkgs, ... }:
 
-let
-  tvpkgs = import ../5pkgs { inherit lib pkgs; };
-in
-
 with builtins;
 with lib;
 let
@@ -63,7 +59,7 @@ let
         ExecStart = pkgs.writeScript "charybdis-service" ''
           #! /bin/sh
           set -euf
-          exec ${tvpkgs.charybdis}/bin/charybdis-ircd \
+          exec ${pkgs.charybdis}/bin/charybdis-ircd \
             -foreground \
             -logfile /dev/stderr \
             -configfile ${configFile}
diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix
index 1daacdb4..8b6f8bbc 100644
--- a/tv/2configs/mail-client.nix
+++ b/tv/2configs/mail-client.nix
@@ -1,7 +1,6 @@
-{ lib, pkgs, ... }:
-
-with import ../5pkgs { inherit lib pkgs; };
+{ pkgs, ... }:
 
+with pkgs;
 {
   environment.systemPackages = [
     much
diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix
index fa556ec7..409b4e9b 100644
--- a/tv/2configs/test.nix
+++ b/tv/2configs/test.nix
@@ -3,8 +3,6 @@
 with import ../4lib { inherit lib pkgs; };
 
 let
-  tvpkgs = import ../5pkgs { inherit lib pkgs; };
-
   out = {
     environment.systemPackages = [
       su-test
@@ -17,12 +15,12 @@ let
     };
   };
 
-  su-test = tvpkgs.execveBin "su-test" rec {
+  su-test = pkgs.execveBin "su-test" rec {
     filename = "/var/setuid-wrappers/sudo";
     argv = ["sudo" "-u" "test" "-i"];
   };
 
-  test-shell = tvpkgs.execve "test-shell" rec {
+  test-shell = pkgs.execve "test-shell" rec {
     filename = "${pkgs.bash}/bin/bash";
     argv = ["sh" "--noprofile" "-l"];
     envp.ENV = pkgs.writeText "test-env" ''
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index a0a22df9..ce137d96 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,11 +1,10 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 let
   inherit (pkgs) callPackage;
-  kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; };
 in
 
-kpkgs // {
+{
   charybdis = callPackage ./charybdis {};
   lentil = callPackage ./lentil {};
   much = callPackage ./much.nix {};
-- 
cgit v1.2.3


From 22a171f3e0405d504e8c8c3b32f73a8087a5ed66 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:36:50 +0200
Subject: krebs pkgs += charybdis lentil much

While there, put everything into subdirectories.
---
 krebs/5pkgs/cac.nix                        | 38 ------------------
 krebs/5pkgs/cac/default.nix                | 38 ++++++++++++++++++
 krebs/5pkgs/charybdis/default.nix          | 34 ++++++++++++++++
 krebs/5pkgs/charybdis/remove-setenv.patch  | 12 ++++++
 krebs/5pkgs/default.nix                    | 21 +++++-----
 krebs/5pkgs/dic.nix                        | 36 -----------------
 krebs/5pkgs/dic/default.nix                | 36 +++++++++++++++++
 krebs/5pkgs/genid.nix                      | 22 ----------
 krebs/5pkgs/genid/default.nix              | 22 ++++++++++
 krebs/5pkgs/github-hosts-sync.nix          | 40 -------------------
 krebs/5pkgs/github-hosts-sync/default.nix  | 40 +++++++++++++++++++
 krebs/5pkgs/github-known_hosts.nix         | 13 ------
 krebs/5pkgs/github-known_hosts/default.nix | 13 ++++++
 krebs/5pkgs/hashPassword.nix               | 16 --------
 krebs/5pkgs/hashPassword/default.nix       | 16 ++++++++
 krebs/5pkgs/lentil/default.nix             | 15 +++++++
 krebs/5pkgs/lentil/syntaxes.patch          | 11 +++++
 krebs/5pkgs/much/default.nix               | 64 ++++++++++++++++++++++++++++++
 krebs/5pkgs/nq.nix                         | 16 --------
 krebs/5pkgs/nq/default.nix                 | 16 ++++++++
 krebs/5pkgs/posix-array.nix                | 31 ---------------
 krebs/5pkgs/posix-array/default.nix        | 31 +++++++++++++++
 krebs/5pkgs/youtube-tools.nix              | 21 ----------
 krebs/5pkgs/youtube-tools/default.nix      | 21 ++++++++++
 tv/5pkgs/charybdis/default.nix             | 34 ----------------
 tv/5pkgs/charybdis/remove-setenv.patch     | 12 ------
 tv/5pkgs/default.nix                       |  3 --
 tv/5pkgs/lentil/default.nix                | 15 -------
 tv/5pkgs/lentil/syntaxes.patch             | 11 -----
 tv/5pkgs/much.nix                          | 64 ------------------------------
 30 files changed, 381 insertions(+), 381 deletions(-)
 delete mode 100644 krebs/5pkgs/cac.nix
 create mode 100644 krebs/5pkgs/cac/default.nix
 create mode 100644 krebs/5pkgs/charybdis/default.nix
 create mode 100644 krebs/5pkgs/charybdis/remove-setenv.patch
 delete mode 100644 krebs/5pkgs/dic.nix
 create mode 100644 krebs/5pkgs/dic/default.nix
 delete mode 100644 krebs/5pkgs/genid.nix
 create mode 100644 krebs/5pkgs/genid/default.nix
 delete mode 100644 krebs/5pkgs/github-hosts-sync.nix
 create mode 100644 krebs/5pkgs/github-hosts-sync/default.nix
 delete mode 100644 krebs/5pkgs/github-known_hosts.nix
 create mode 100644 krebs/5pkgs/github-known_hosts/default.nix
 delete mode 100644 krebs/5pkgs/hashPassword.nix
 create mode 100644 krebs/5pkgs/hashPassword/default.nix
 create mode 100644 krebs/5pkgs/lentil/default.nix
 create mode 100644 krebs/5pkgs/lentil/syntaxes.patch
 create mode 100644 krebs/5pkgs/much/default.nix
 delete mode 100644 krebs/5pkgs/nq.nix
 create mode 100644 krebs/5pkgs/nq/default.nix
 delete mode 100644 krebs/5pkgs/posix-array.nix
 create mode 100644 krebs/5pkgs/posix-array/default.nix
 delete mode 100644 krebs/5pkgs/youtube-tools.nix
 create mode 100644 krebs/5pkgs/youtube-tools/default.nix
 delete mode 100644 tv/5pkgs/charybdis/default.nix
 delete mode 100644 tv/5pkgs/charybdis/remove-setenv.patch
 delete mode 100644 tv/5pkgs/lentil/default.nix
 delete mode 100644 tv/5pkgs/lentil/syntaxes.patch
 delete mode 100644 tv/5pkgs/much.nix

diff --git a/krebs/5pkgs/cac.nix b/krebs/5pkgs/cac.nix
deleted file mode 100644
index eff52304..00000000
--- a/krebs/5pkgs/cac.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, jq, ncurses, sshpass, ... }:
-
-stdenv.mkDerivation {
-  name = "cac";
-
-  src = fetchgit {
-    url = http://cgit.cd.retiolum/cac;
-    rev = "f4589158572ab35969b9bccf801ea07e115705e1";
-    sha256 = "9d761cd1d7ff68507392cbfd6c3f6000ddff9cc540293da2b3c4ee902321fb27";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase =
-    let
-      path = stdenv.lib.makeSearchPath "bin" [
-        coreutils
-        curl
-        gnused
-        jq
-        ncurses
-        sshpass
-      ];
-    in
-    ''
-      mkdir -p $out/bin
-
-      sed \
-        's,^\(  true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \
-        < ./cac \
-        > $out/bin/cac
-
-      chmod +x $out/bin/cac
-    '';
-}
diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
new file mode 100644
index 00000000..eff52304
--- /dev/null
+++ b/krebs/5pkgs/cac/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, coreutils, curl, gnused, jq, ncurses, sshpass, ... }:
+
+stdenv.mkDerivation {
+  name = "cac";
+
+  src = fetchgit {
+    url = http://cgit.cd.retiolum/cac;
+    rev = "f4589158572ab35969b9bccf801ea07e115705e1";
+    sha256 = "9d761cd1d7ff68507392cbfd6c3f6000ddff9cc540293da2b3c4ee902321fb27";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase =
+    let
+      path = stdenv.lib.makeSearchPath "bin" [
+        coreutils
+        curl
+        gnused
+        jq
+        ncurses
+        sshpass
+      ];
+    in
+    ''
+      mkdir -p $out/bin
+
+      sed \
+        's,^\(  true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \
+        < ./cac \
+        > $out/bin/cac
+
+      chmod +x $out/bin/cac
+    '';
+}
diff --git a/krebs/5pkgs/charybdis/default.nix b/krebs/5pkgs/charybdis/default.nix
new file mode 100644
index 00000000..f3e6be40
--- /dev/null
+++ b/krebs/5pkgs/charybdis/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchgit, bison, flex, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "charybdis-3.5.0-rc1";
+
+  src = fetchgit {
+    url = "https://github.com/atheme/charybdis.git";
+    rev = "61815bf9324e872f51255e09fe37a8c595f94a60";
+    sha256 = "0zsd6xk2cnspc1cvryy2296p3ix4hwjd9k24wmgbh5wzks0wahwy";
+  };
+
+  patches = [
+    ./remove-setenv.patch
+  ];
+
+  configureFlags = [
+    "--enable-epoll"
+    "--enable-ipv6"
+    "--enable-openssl=${openssl}"
+    "--enable-small-net"
+    "--with-program-prefix=charybdis-"
+    "--sysconfdir=/tmp"
+  ];
+
+  buildInputs = [ bison flex openssl ];
+
+  meta = {
+    description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys";
+    homepage    = https://github.com/atheme/charybdis;
+    license     = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/krebs/5pkgs/charybdis/remove-setenv.patch b/krebs/5pkgs/charybdis/remove-setenv.patch
new file mode 100644
index 00000000..bbaf95e1
--- /dev/null
+++ b/krebs/5pkgs/charybdis/remove-setenv.patch
@@ -0,0 +1,12 @@
+diff --git a/src/bandbi.c b/src/bandbi.c
+index 03dd907..3698e85 100644
+--- a/src/bandbi.c
++++ b/src/bandbi.c
+@@ -82,7 +82,6 @@ start_bandb(void)
+ 	const char *suffix = "";
+ #endif
+
+-	rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
+ 	if(bandb_path == NULL)
+ 	{
+ 		rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 2f7a24ed..71bee3fa 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -7,15 +7,18 @@ let
 in
 
 rec {
-  cac = callPackage ./cac.nix {};
-  dic = callPackage ./dic.nix {};
-  genid = callPackage ./genid.nix {};
-  github-hosts-sync = callPackage ./github-hosts-sync.nix {};
-  github-known_hosts = callPackage ./github-known_hosts.nix {};
-  hashPassword = callPackage ./hashPassword.nix {};
-  nq = callPackage ./nq.nix {};
-  posix-array = callPackage ./posix-array.nix {};
-  youtube-tools = callPackage ./youtube-tools.nix {};
+  cac = callPackage ./cac {};
+  charybdis = callPackage ./charybdis {};
+  dic = callPackage ./dic {};
+  genid = callPackage ./genid {};
+  github-hosts-sync = callPackage ./github-hosts-sync {};
+  github-known_hosts = callPackage ./github-known_hosts {};
+  hashPassword = callPackage ./hashPassword {};
+  lentil = callPackage ./lentil {};
+  much = callPackage ./much {};
+  nq = callPackage ./nq {};
+  posix-array = callPackage ./posix-array {};
+  youtube-tools = callPackage ./youtube-tools {};
 
   execve = name: { filename, argv, envp ? {}, destination ? "" }:
     writeC name { inherit destination; } ''
diff --git a/krebs/5pkgs/dic.nix b/krebs/5pkgs/dic.nix
deleted file mode 100644
index 571773d2..00000000
--- a/krebs/5pkgs/dic.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }:
-
-stdenv.mkDerivation {
-  name = "dic";
-
-  src = fetchgit {
-    url = https://github.com/krebscode/painload;
-    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase =
-    let
-      path = stdenv.lib.makeSearchPath "bin" [
-        coreutils
-        curl
-        gnused
-        gnugrep
-      ];
-    in
-    ''
-      mkdir -p $out/bin
-
-      sed \
-        's,^main() {$,&\n  PATH=${path}; export PATH,' \
-        < ./util/bin/dic \
-        > $out/bin/dic
-
-      chmod +x $out/bin/dic
-    '';
-}
diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix
new file mode 100644
index 00000000..571773d2
--- /dev/null
+++ b/krebs/5pkgs/dic/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }:
+
+stdenv.mkDerivation {
+  name = "dic";
+
+  src = fetchgit {
+    url = https://github.com/krebscode/painload;
+    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
+    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase =
+    let
+      path = stdenv.lib.makeSearchPath "bin" [
+        coreutils
+        curl
+        gnused
+        gnugrep
+      ];
+    in
+    ''
+      mkdir -p $out/bin
+
+      sed \
+        's,^main() {$,&\n  PATH=${path}; export PATH,' \
+        < ./util/bin/dic \
+        > $out/bin/dic
+
+      chmod +x $out/bin/dic
+    '';
+}
diff --git a/krebs/5pkgs/genid.nix b/krebs/5pkgs/genid.nix
deleted file mode 100644
index c75bec31..00000000
--- a/krebs/5pkgs/genid.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, pkgs, ... }:
-
-pkgs.writeScriptBin "genid" ''
-  #! /bin/sh
-  # usage: genid NAME
-  set -euf
-
-  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
-    bc
-    coreutils
-  ])}
-
-  name=$1
-  hash=$(printf %s "$name" | sha1sum | cut -d\  -f1 | tr a-f A-F)
-  echo "
-    min=2^24  # bigger than nobody and nogroup, see <nixos/modules/misc/ids.nix>
-              # and some spare for stuff like lxd.
-    max=2^32  # see 2^(8*sizeof(uid_t))
-    ibase=16
-    ($hash + min) % max
-  " | bc
-''
diff --git a/krebs/5pkgs/genid/default.nix b/krebs/5pkgs/genid/default.nix
new file mode 100644
index 00000000..c75bec31
--- /dev/null
+++ b/krebs/5pkgs/genid/default.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, ... }:
+
+pkgs.writeScriptBin "genid" ''
+  #! /bin/sh
+  # usage: genid NAME
+  set -euf
+
+  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
+    bc
+    coreutils
+  ])}
+
+  name=$1
+  hash=$(printf %s "$name" | sha1sum | cut -d\  -f1 | tr a-f A-F)
+  echo "
+    min=2^24  # bigger than nobody and nogroup, see <nixos/modules/misc/ids.nix>
+              # and some spare for stuff like lxd.
+    max=2^32  # see 2^(8*sizeof(uid_t))
+    ibase=16
+    ($hash + min) % max
+  " | bc
+''
diff --git a/krebs/5pkgs/github-hosts-sync.nix b/krebs/5pkgs/github-hosts-sync.nix
deleted file mode 100644
index d69b2b12..00000000
--- a/krebs/5pkgs/github-hosts-sync.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchgit, pkgs, ... }:
-
-stdenv.mkDerivation {
-  name = "github-hosts-sync";
-
-  src = fetchgit {
-    url = https://github.com/krebscode/painload;
-    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase =
-    let
-      ca-bundle = "${pkgs.cacert}/etc/ca-bundle.crt";
-      path = stdenv.lib.makeSearchPath "bin" (with pkgs; [
-        coreutils
-        findutils
-        git
-        gnugrep
-        gnused
-        openssh
-        socat
-      ]);
-    in
-    ''
-      mkdir -p $out/bin
-
-      sed \
-        's,^main() {$,&\n  export PATH=${path} GIT_SSL_CAINFO=${ca-bundle},' \
-        < ./retiolum/scripts/github_hosts_sync/hosts-sync \
-        > $out/bin/github-hosts-sync
-
-      chmod +x $out/bin/github-hosts-sync
-    '';
-}
diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/github-hosts-sync/default.nix
new file mode 100644
index 00000000..d69b2b12
--- /dev/null
+++ b/krebs/5pkgs/github-hosts-sync/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, pkgs, ... }:
+
+stdenv.mkDeriva