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

(limited to 'krebs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1eb..062f0a515 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 000000000..29142b8b9
--- /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 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(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
index 29142b8b9..d767728be 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(+)

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index f143e64b8..e508b919d 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 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(-)

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e508b919d..3d34ddf12 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 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 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 krebs/5pkgs/nq.nix

(limited to 'krebs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1eb..2149b6f10 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 000000000..0f397a43c
--- /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
+  '';
+}
-- 
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 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 krebs/4lib/shell.nix

(limited to 'krebs')

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index b67585335..8b587dfb2 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 000000000..48b220f87
--- /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}");
+}
-- 
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(+)

(limited to 'krebs')

diff --git a/krebs/4lib/shell.nix b/krebs/4lib/shell.nix
index 48b220f87..2a6da5c16 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 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 8b587dfb2..ca7219c7e 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 2149b6f10..c8fb1d2d7 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
+  '';
 }
-- 
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(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c8fb1d2d7..406bd15eb 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 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(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 3658c43e0..54604382f 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 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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 0274b9d15..207b937de 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
-- 
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

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

(limited to 'krebs')

diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 207b937de..dbc0cc1de 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 54604382f..2f7a24ed2 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 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 ++++++++++
 24 files changed, 381 insertions(+), 242 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

(limited to 'krebs')

diff --git a/krebs/5pkgs/cac.nix b/krebs/5pkgs/cac.nix
deleted file mode 100644
index eff523048..000000000
--- 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 000000000..eff523048
--- /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 000000000..f3e6be40e
--- /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 000000000..bbaf95e19
--- /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 2f7a24ed2..71bee3fa2 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 571773d22..000000000
--- 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 000000000..571773d22
--- /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 c75bec317..000000000
--- 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 000000000..c75bec317
--- /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 d69b2b12b..000000000
--- 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 000000000..d69b2b12b
--- /dev/null
+++ b/krebs/5pkgs/github-hosts-sync/default.nix
@@ -0,0 +1,40 @@
+{ 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-known_hosts.nix b/krebs/5pkgs/github-known_hosts.nix
deleted file mode 100644
index 302fdd8d5..000000000
--- a/krebs/5pkgs/github-known_hosts.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ lib, ... }:
-
-with builtins;
-with lib;
-
-let
-  github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub);
-in
-
-toFile "github-known_hosts"
-  (concatMapStrings
-    (i: "github.com,192.30.252.${toString i} ${github-pubkey}\n")
-    (range 0 255))
diff --git a/krebs/5pkgs/github-known_hosts/default.nix b/krebs/5pkgs/github-known_hosts/default.nix
new file mode 100644
index 000000000..302fdd8d5
--- /dev/null
+++ b/krebs/5pkgs/github-known_hosts/default.nix
@@ -0,0 +1,13 @@
+{ lib, ... }:
+
+with builtins;
+with lib;
+
+let
+  github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub);
+in
+
+toFile "github-known_hosts"
+  (concatMapStrings
+    (i: "github.com,192.30.252.${toString i} ${github-pubkey}\n")
+    (range 0 255))
diff --git a/krebs/5pkgs/hashPassword.nix b/krebs/5pkgs/hashPassword.nix
deleted file mode 100644
index a10340cc4..000000000
--- a/krebs/5pkgs/hashPassword.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ lib, pkgs, ... }:
-
-pkgs.writeScriptBin "hashPassword" ''
-  #! /bin/sh
-  # usage: hashPassword
-  set -euf
-
-  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
-    coreutils
-    mkpasswd
-    openssl
-  ])}
-
-  salt=$(openssl rand -base64 16 | tr -d '+=' | head -c 16)
-  exec mkpasswd -m sha-512 -S "$salt"
-''
diff --git a/krebs/5pkgs/hashPassword/default.nix b/krebs/5pkgs/hashPassword/default.nix
new file mode 100644
index 000000000..a10340cc4
--- /dev/null
+++ b/krebs/5pkgs/hashPassword/default.nix
@@ -0,0 +1,16 @@
+{ lib, pkgs, ... }:
+
+pkgs.writeScriptBin "hashPassword" ''
+  #! /bin/sh
+  # usage: hashPassword
+  set -euf
+
+  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
+    coreutils
+    mkpasswd
+    openssl
+  ])}
+
+  salt=$(openssl rand -base64 16 | tr -d '+=' | head -c 16)
+  exec mkpasswd -m sha-512 -S "$salt"
+''
diff --git a/krebs/5pkgs/lentil/default.nix b/krebs/5pkgs/lentil/default.nix
new file mode 100644
index 000000000..fc9b4fd31
--- /dev/null
+++ b/krebs/5pkgs/lentil/default.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+(pkgs.haskellngPackages.override {
+  overrides = self: super: {
+    lentil = super.lentil.override {
+      mkDerivation = (attrs: self.mkDerivation (attrs // {
+        version = "0.1.3.0";
+        sha256 = "0xa59avh0bvfg69xh9p5b8dppfhx29mvfq8v41sk9j7qbcnzjivg";
+        patches = [
+          ./syntaxes.patch
+        ];
+      }));
+    };
+  };
+}).lentil
diff --git a/krebs/5pkgs/lentil/syntaxes.patch b/krebs/5pkgs/lentil/syntaxes.patch
new file mode 100644
index 000000000..a9390ae51
--- /dev/null
+++ b/krebs/5pkgs/lentil/syntaxes.patch
@@ -0,0 +1,11 @@
+diff -rN -u old-lentil/src/Lentil/Parse/Syntaxes.hs new-lentil/src/Lentil/Parse/Syntaxes.hs
+--- old-lentil/src/Lentil/Parse/Syntaxes.hs	2015-07-20 23:15:38.600539779 +0200
++++ new-lentil/src/Lentil/Parse/Syntaxes.hs	2015-07-20 23:15:38.600539779 +0200
+@@ -30,6 +30,7 @@
+               | ext `elem` [".pas", ".pp", ".inc"] = Just pascal
+               | ext `elem` [".py"]                 = Just python
+               | ext `elem` [".rb"]                 = Just ruby
++              | ext `elem` [".nix"]                = Just perl -- Nix
+               | ext `elem` [".pl", ".pm", ".t"]    = Just perl
+               | ext `elem` [".sh"]                 = Just perl -- shell
+               | ext `elem` [".txt"]                = Just text
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix
new file mode 100644
index 000000000..82586b422
--- /dev/null
+++ b/krebs/5pkgs/much/default.nix
@@ -0,0 +1,64 @@
+{ pkgs, ... }:
+
+let
+   hspkgs = pkgs.haskellngPackages.override {
+     overrides = self: super: {
+       email-header = self.callPackage (
+{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+, case-insensitive, containers, exceptions, fetchgit, QuickCheck
+, stdenv, tasty, tasty-quickcheck, text, text-icu, time
+}:
+mkDerivation {
+  pname = "email-header";
+  version = "0.3.0";
+  src = fetchgit {
+    url = "https://github.com/4z3/email-header";
+    sha256 = "f33fba567a39b1f2448869b269c26c40d8007599c23ab83bde5b4dfd9fd76ebc";
+    rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
+  };
+  buildDepends = [
+    attoparsec base base64-bytestring bytestring case-insensitive
+    containers exceptions text text-icu time
+  ];
+  testDepends = [
+    base bytestring case-insensitive containers QuickCheck tasty
+    tasty-quickcheck text time
+  ];
+  jailbreak = true;
+  homepage = "http://github.com/knrafto/email-header";
+  description = "Parsing and rendering of email and MIME headers";
+  license = stdenv.lib.licenses.bsd3;
+}
+) {};
+    };
+  };
+in
+
+hspkgs.callPackage (
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, blaze-builder, bytestring, case-insensitive, containers, deepseq
+, directory, docopt, email-header, fetchgit, filepath
+, friendly-time, hyphenation, linebreak, old-locale, process
+, random, rosezipper, safe, split, stdenv, terminal-size, text
+, time, transformers, transformers-compat, unix, vector
+}:
+mkDerivation {
+  pname = "much";
+  version = "0.0.0.0";
+  src = fetchgit {
+    url = "http://cgit.nomic/much";
+    sha256 = "f0bcc34456cb876d3439694d1e16db414a540e13f476fa3ff1ad70d1d3caccb2";
+    rev = "bfd854e05207a073eaa983c49f27c37555ccfce5";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec base base64-bytestring blaze-builder bytestring
+    case-insensitive containers deepseq directory docopt email-header
+    filepath friendly-time hyphenation linebreak old-locale process
+    random rosezipper safe split terminal-size text time transformers
+    transformers-compat unix vector
+  ];
+  license = stdenv.lib.licenses.mit;
+}
+) {}
diff --git a/krebs/5pkgs/nq.nix b/krebs/5pkgs/nq.nix
deleted file mode 100644
index 0f397a43c..000000000
--- a/krebs/5pkgs/nq.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ 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/krebs/5pkgs/nq/default.nix b/krebs/5pkgs/nq/default.nix
new file mode 100644
index 000000000..0f397a43c
--- /dev/null
+++ b/krebs/5pkgs/nq/default.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/krebs/5pkgs/posix-array.nix b/krebs/5pkgs/posix-array.nix
deleted file mode 100644
index 456a3cc11..000000000
--- a/krebs/5pkgs/posix-array.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, ... }:
-
-with stdenv; stdenv.mkDerivation rec {
-  name = "posix-array";
-  version = "1.0.0";
-
-  src = fetchgit {
-    url = https://github.com/makefu/array.git;
-    rev = "refs/tags/${version}";
-    sha256 = "0yzwlhdg1rgc4p64ny7gj30l7z6vikhskhppsa2qj7s9gm2gz938";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp -a ./array $out/bin
-    rm *
-  '';
-
-  meta = {
-    description = "Posix-compliant array implementation";
-    url = https://github.com/makefu/array;
-    license = licenses.wtfpl;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ makefu ];
-  };
-}
diff --git a/krebs/5pkgs/posix-array/default.nix b/krebs/5pkgs/posix-array/default.nix
new file mode 100644
index 000000000..456a3cc11
--- /dev/null
+++ b/krebs/5pkgs/posix-array/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, ... }:
+
+with stdenv; stdenv.mkDerivation rec {
+  name = "posix-array";
+  version = "1.0.0";
+
+  src = fetchgit {
+    url = https://github.com/makefu/array.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0yzwlhdg1rgc4p64ny7gj30l7z6vikhskhppsa2qj7s9gm2gz938";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -a ./array $out/bin
+    rm *
+  '';
+
+  meta = {
+    description = "Posix-compliant array implementation";
+    url = https://github.com/makefu/array;
+    license = licenses.wtfpl;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ makefu ];
+  };
+}
diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
deleted file mode 100644
index d767728be..000000000
--- a/krebs/5pkgs/youtube-tools.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, ... }:
-
-stdenv.mkDerivation {
-  name = "youtube-tools";
-
-  src = fetchgit {
-    url = https://github.com/Lassulus/the_playlist;
-    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
-    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin/
-  '';
-}
diff --git a/krebs/5pkgs/youtube-tools/default.nix b/krebs/5pkgs/youtube-tools/default.nix
new file mode 100644
index 000000000..d767728be
--- /dev/null
+++ b/krebs/5pkgs/youtube-tools/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, ... }:
+
+stdenv.mkDerivation {
+  name = "youtube-tools";
+
+  src = fetchgit {
+    url = https://github.com/Lassulus/the_playlist;
+    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
+    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin/
+  '';
+}
-- 
cgit v1.2.3


From cb6bede2f65bdcaafe547fdffd8c99f671c54ee9 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:48:37 +0200
Subject: Zpubkeys github -> krebs pkgs github-known_hosts

---
 krebs/5pkgs/github-known_hosts/default.nix    | 2 +-
 krebs/5pkgs/github-known_hosts/github.ssh.pub | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 krebs/5pkgs/github-known_hosts/github.ssh.pub

(limited to 'krebs')

diff --git a/krebs/5pkgs/github-known_hosts/default.nix b/krebs/5pkgs/github-known_hosts/default.nix
index 302fdd8d5..fe5efe413 100644
--- a/krebs/5pkgs/github-known_hosts/default.nix
+++ b/krebs/5pkgs/github-known_hosts/default.nix
@@ -4,7 +4,7 @@ with builtins;
 with lib;
 
 let
-  github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub);
+  github-pubkey = removeSuffix "\n" (readFile ./github.ssh.pub);
 in
 
 toFile "github-known_hosts"
diff --git a/krebs/5pkgs/github-known_hosts/github.ssh.pub b/krebs/5pkgs/github-known_hosts/github.ssh.pub
new file mode 100644
index 000000000..90f6e2b71
--- /dev/null
+++ b/krebs/5pkgs/github-known_hosts/github.ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-- 
cgit v1.2.3


From 5591b1dd120dac7cc52098eaacb1476da7b9cb84 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:58:41 +0200
Subject: Z* -> */Z*

---
 krebs/3modules/default.nix             | 10 +++++-----
 krebs/3modules/retiolum.nix            |  2 +-
 krebs/Zhosts/Styx                      | 10 ++++++++++
 krebs/Zhosts/ThinkArmageddon           |  9 +++++++++
 krebs/Zhosts/TriBot                    | 11 +++++++++++
 krebs/Zhosts/ach                       | 11 +++++++++++
 krebs/Zhosts/air                       | 11 +++++++++++
 krebs/Zhosts/alarmpi                   | 11 +++++++++++
 krebs/Zhosts/albi10                    | 11 +++++++++++
 krebs/Zhosts/albi7                     | 10 ++++++++++
 krebs/Zhosts/almoehi                   | 11 +++++++++++
 krebs/Zhosts/alphalabs                 | 10 ++++++++++
 krebs/Zhosts/apfull                    | 11 +++++++++++
 krebs/Zhosts/bitchctl                  | 11 +++++++++++
 krebs/Zhosts/bitchextend               | 11 +++++++++++
 krebs/Zhosts/bitchtop                  | 11 +++++++++++
 krebs/Zhosts/box                       | 10 ++++++++++
 krebs/Zhosts/bridge                    | 12 ++++++++++++
 krebs/Zhosts/c2ft                      | 10 ++++++++++
 krebs/Zhosts/c2fthome                  | 10 ++++++++++
 krebs/Zhosts/casino                    | 11 +++++++++++
 krebs/Zhosts/cat1                      | 11 +++++++++++
 krebs/Zhosts/cband                     | 11 +++++++++++
 krebs/Zhosts/cd                        | 17 +++++++++++++++++
 krebs/Zhosts/cloudkrebs                | 12 ++++++++++++
 krebs/Zhosts/darth                     | 12 ++++++++++++
 krebs/Zhosts/dei                       | 11 +++++++++++
 krebs/Zhosts/destroy                   | 11 +++++++++++
 krebs/Zhosts/devstar                   | 11 +++++++++++
 krebs/Zhosts/eigenserv                 | 11 +++++++++++
 krebs/Zhosts/elvis                     | 12 ++++++++++++
 krebs/Zhosts/eulerwalk                 | 11 +++++++++++
 krebs/Zhosts/exile                     |  9 +++++++++
 krebs/Zhosts/exitium_mobilis           | 10 ++++++++++
 krebs/Zhosts/falk                      | 11 +++++++++++
 krebs/Zhosts/fastpoke                  | 12 ++++++++++++
 krebs/Zhosts/filebitch                 | 11 +++++++++++
 krebs/Zhosts/filepimp                  | 11 +++++++++++
 krebs/Zhosts/flap                      | 12 ++++++++++++
 krebs/Zhosts/foobar                    | 11 +++++++++++
 krebs/Zhosts/fuerkrebs                 | 10 ++++++++++
 krebs/Zhosts/go                        | 13 +++++++++++++
 krebs/Zhosts/gum                       | 14 ++++++++++++++
 krebs/Zhosts/heidi                     | 11 +++++++++++
 krebs/Zhosts/horisa                    | 12 ++++++++++++
 krebs/Zhosts/horreum_magnus            | 15 +++++++++++++++
 krebs/Zhosts/incept                    | 13 +++++++++++++
 krebs/Zhosts/ire                       | 12 ++++++++++++
 krebs/Zhosts/ire2                      |  9 +++++++++
 krebs/Zhosts/irkel                     | 12 ++++++++++++
 krebs/Zhosts/juhulian                  | 11 +++++++++++
 krebs/Zhosts/k2                        | 28 ++++++++++++++++++++++++++++
 krebs/Zhosts/kabinett                  | 11 +++++++++++
 krebs/Zhosts/kaepsele                  | 11 +++++++++++
 krebs/Zhosts/kalle                     | 11 +++++++++++
 krebs/Zhosts/karthus                   | 10 ++++++++++
 krebs/Zhosts/khackplug                 | 11 +++++++++++
 krebs/Zhosts/kheurop                   | 12 ++++++++++++
 krebs/Zhosts/kiosk                     | 12 ++++++++++++
 krebs/Zhosts/krebsplug                 | 10 ++++++++++
 krebs/Zhosts/kvasir                    | 11 +++++++++++
 krebs/Zhosts/laqueus                   | 11 +++++++++++
 krebs/Zhosts/linuxatom                 | 11 +++++++++++
 krebs/Zhosts/luminos                   | 11 +++++++++++
 krebs/Zhosts/machine                   | 11 +++++++++++
 krebs/Zhosts/makalu                    | 11 +++++++++++
 krebs/Zhosts/mako                      | 11 +++++++++++
 krebs/Zhosts/miefda0                   | 10 ++++++++++
 krebs/Zhosts/minikrebs                 | 10 ++++++++++
 krebs/Zhosts/mkdir                     | 11 +++++++++++
 krebs/Zhosts/monitor                   | 11 +++++++++++
 krebs/Zhosts/mors                      | 10 ++++++++++
 krebs/Zhosts/motor                     | 12 ++++++++++++
 krebs/Zhosts/mu                        | 10 ++++++++++
 krebs/Zhosts/muhbaasu                  | 13 +++++++++++++
 krebs/Zhosts/nomic                     | 10 ++++++++++
 krebs/Zhosts/nomic2                    | 10 ++++++++++
 krebs/Zhosts/nukular                   | 11 +++++++++++
 krebs/Zhosts/omo                       |  9 +++++++++
 krebs/Zhosts/pic                       | 11 +++++++++++
 krebs/Zhosts/pigstarter                | 13 +++++++++++++
 krebs/Zhosts/pike                      | 11 +++++++++++
 krebs/Zhosts/pnp                       | 11 +++++++++++
 krebs/Zhosts/pornocauster              | 10 ++++++++++
 krebs/Zhosts/radiotuxmini              | 11 +++++++++++
 krebs/Zhosts/random                    | 10 ++++++++++
 krebs/Zhosts/raspafari                 | 11 +++++++++++
 krebs/Zhosts/reimae                    | 12 ++++++++++++
 krebs/Zhosts/rmdir                     | 11 +++++++++++
 krebs/Zhosts/robchina                  | 11 +++++++++++
 krebs/Zhosts/rockit                    | 11 +++++++++++
 krebs/Zhosts/rtjure_debian_oder_so     | 11 +++++++++++
 krebs/Zhosts/rtjure_ras                | 11 +++++++++++
 krebs/Zhosts/rtjure_rdrlab_linkstation | 11 +++++++++++
 krebs/Zhosts/rubus                     |  9 +++++++++
 krebs/Zhosts/senderechner              | 10 ++++++++++
 krebs/Zhosts/serenity                  | 11 +++++++++++
 krebs/Zhosts/seruundroid               | 12 ++++++++++++
 krebs/Zhosts/sir_krebs_a_lot           | 11 +++++++++++
 krebs/Zhosts/skirfir                   | 11 +++++++++++
 krebs/Zhosts/sleipnir                  | 12 ++++++++++++
 krebs/Zhosts/smove                     |  9 +++++++++
 krebs/Zhosts/sokrates                  | 11 +++++++++++
 krebs/Zhosts/sokrateslaptop            | 11 +++++++++++
 krebs/Zhosts/soundflower               | 10 ++++++++++
 krebs/Zhosts/steve                     | 10 ++++++++++
 krebs/Zhosts/tahoe                     | 12 ++++++++++++
 krebs/Zhosts/taschenkrebs              | 11 +++++++++++
 krebs/Zhosts/terrapi                   | 11 +++++++++++
 krebs/Zhosts/thomasDOTde               |  9 +++++++++
 krebs/Zhosts/tincdroid                 |  9 +++++++++
 krebs/Zhosts/tmpd                      | 11 +++++++++++
 krebs/Zhosts/tpsw                      | 11 +++++++++++
 krebs/Zhosts/tsp                       | 16 ++++++++++++++++
 krebs/Zhosts/ufo                       | 11 +++++++++++
 krebs/Zhosts/uriel                     | 11 +++++++++++
 krebs/Zhosts/vault                     | 10 ++++++++++
 krebs/Zhosts/voyager                   | 17 +++++++++++++++++
 krebs/Zhosts/wooktop                   | 11 +++++++++++
 krebs/Zhosts/wu                        | 10 ++++++++++
 krebs/Zhosts/ytart                     |  9 +++++++++
 krebs/Zhosts/zombiecancer              | 11 +++++++++++
 krebs/Zpubkeys/deploy_wu.ssh.pub       |  1 +
 krebs/Zpubkeys/lass.ssh.pub            |  1 +
 krebs/Zpubkeys/makefu_arch.ssh.pub     |  1 +
 krebs/Zpubkeys/makefu_omo.ssh.pub      |  1 +
 krebs/Zpubkeys/makefu_tsp.ssh.pub      |  1 +
 krebs/Zpubkeys/mv_vod.ssh.pub          |  1 +
 krebs/Zpubkeys/tv_wu.ssh.pub           |  1 +
 krebs/Zpubkeys/uriel.ssh.pub           |  1 +
 130 files changed, 1358 insertions(+), 6 deletions(-)
 create mode 100644 krebs/Zhosts/Styx
 create mode 100644 krebs/Zhosts/ThinkArmageddon
 create mode 100644 krebs/Zhosts/TriBot
 create mode 100644 krebs/Zhosts/ach
 create mode 100644 krebs/Zhosts/air
 create mode 100644 krebs/Zhosts/alarmpi
 create mode 100644 krebs/Zhosts/albi10
 create mode 100644 krebs/Zhosts/albi7
 create mode 100644 krebs/Zhosts/almoehi
 create mode 100644 krebs/Zhosts/alphalabs
 create mode 100644 krebs/Zhosts/apfull
 create mode 100644 krebs/Zhosts/bitchctl
 create mode 100644 krebs/Zhosts/bitchextend
 create mode 100644 krebs/Zhosts/bitchtop
 create mode 100644 krebs/Zhosts/box
 create mode 100644 krebs/Zhosts/bridge
 create mode 100644 krebs/Zhosts/c2ft
 create mode 100644 krebs/Zhosts/c2fthome
 create mode 100644 krebs/Zhosts/casino
 create mode 100644 krebs/Zhosts/cat1
 create mode 100644 krebs/Zhosts/cband
 create mode 100644 krebs/Zhosts/cd
 create mode 100644 krebs/Zhosts/cloudkrebs
 create mode 100644 krebs/Zhosts/darth
 create mode 100644 krebs/Zhosts/dei
 create mode 100644 krebs/Zhosts/destroy
 create mode 100644 krebs/Zhosts/devstar
 create mode 100644 krebs/Zhosts/eigenserv
 create mode 100644 krebs/Zhosts/elvis
 create mode 100644 krebs/Zhosts/eulerwalk
 create mode 100644 krebs/Zhosts/exile
 create mode 100644 krebs/Zhosts/exitium_mobilis
 create mode 100644 krebs/Zhosts/falk
 create mode 100644 krebs/Zhosts/fastpoke
 create mode 100644 krebs/Zhosts/filebitch
 create mode 100644 krebs/Zhosts/filepimp
 create mode 100644 krebs/Zhosts/flap
 create mode 100644 krebs/Zhosts/foobar
 create mode 100644 krebs/Zhosts/fuerkrebs
 create mode 100644 krebs/Zhosts/go
 create mode 100644 krebs/Zhosts/gum
 create mode 100644 krebs/Zhosts/heidi
 create mode 100644 krebs/Zhosts/horisa
 create mode 100644 krebs/Zhosts/horreum_magnus
 create mode 100644 krebs/Zhosts/incept
 create mode 100644 krebs/Zhosts/ire
 create mode 100644 krebs/Zhosts/ire2
 create mode 100644 krebs/Zhosts/irkel
 create mode 100644 krebs/Zhosts/juhulian
 create mode 100644 krebs/Zhosts/k2
 create mode 100644 krebs/Zhosts/kabinett
 create mode 100644 krebs/Zhosts/kaepsele
 create mode 100644 krebs/Zhosts/kalle
 create mode 100644 krebs/Zhosts/karthus
 create mode 100644 krebs/Zhosts/khackplug
 create mode 100644 krebs/Zhosts/kheurop
 create mode 100644 krebs/Zhosts/kiosk
 create mode 100644 krebs/Zhosts/krebsplug
 create mode 100644 krebs/Zhosts/kvasir
 create mode 100644 krebs/Zhosts/laqueus
 create mode 100644 krebs/Zhosts/linuxatom
 create mode 100644 krebs/Zhosts/luminos
 create mode 100644 krebs/Zhosts/machine
 create mode 100644 krebs/Zhosts/makalu
 create mode 100644 krebs/Zhosts/mako
 create mode 100644 krebs/Zhosts/miefda0
 create mode 100644 krebs/Zhosts/minikrebs
 create mode 100644 krebs/Zhosts/mkdir
 create mode 100644 krebs/Zhosts/monitor
 create mode 100644 krebs/Zhosts/mors
 create mode 100644 krebs/Zhosts/motor
 create mode 100644 krebs/Zhosts/mu
 create mode 100644 krebs/Zhosts/muhbaasu
 create mode 100644 krebs/Zhosts/nomic
 create mode 100644 krebs/Zhosts/nomic2
 create mode 100644 krebs/Zhosts/nukular
 create mode 100644 krebs/Zhosts/omo
 create mode 100644 krebs/Zhosts/pic
 create mode 100644 krebs/Zhosts/pigstarter
 create mode 100644 krebs/Zhosts/pike
 create mode 100644 krebs/Zhosts/pnp
 create mode 100644 krebs/Zhosts/pornocauster
 create mode 100644 krebs/Zhosts/radiotuxmini
 create mode 100644 krebs/Zhosts/random
 create mode 100644 krebs/Zhosts/raspafari
 create mode 100644 krebs/Zhosts/reimae
 create mode 100644 krebs/Zhosts/rmdir
 create mode 100644 krebs/Zhosts/robchina
 create mode 100644 krebs/Zhosts/rockit
 create mode 100644 krebs/Zhosts/rtjure_debian_oder_so
 create mode 100644 krebs/Zhosts/rtjure_ras
 create mode 100644 krebs/Zhosts/rtjure_rdrlab_linkstation
 create mode 100644 krebs/Zhosts/rubus
 create mode 100644 krebs/Zhosts/senderechner
 create mode 100644 krebs/Zhosts/serenity
 create mode 100644 krebs/Zhosts/seruundroid
 create mode 100644 krebs/Zhosts/sir_krebs_a_lot
 create mode 100644 krebs/Zhosts/skirfir
 create mode 100644 krebs/Zhosts/sleipnir
 create mode 100644 krebs/Zhosts/smove
 create mode 100644 krebs/Zhosts/sokrates
 create mode 100644 krebs/Zhosts/sokrateslaptop
 create mode 100644 krebs/Zhosts/soundflower
 create mode 100644 krebs/Zhosts/steve
 create mode 100644 krebs/Zhosts/tahoe
 create mode 100644 krebs/Zhosts/taschenkrebs
 create mode 100644 krebs/Zhosts/terrapi
 create mode 100644 krebs/Zhosts/thomasDOTde
 create mode 100644 krebs/Zhosts/tincdroid
 create mode 100644 krebs/Zhosts/tmpd
 create mode 100644 krebs/Zhosts/tpsw
 create mode 100644 krebs/Zhosts/tsp
 create mode 100644 krebs/Zhosts/ufo
 create mode 100644 krebs/Zhosts/uriel
 create mode 100644 krebs/Zhosts/vault
 create mode 100644 krebs/Zhosts/voyager
 create mode 100644 krebs/Zhosts/wooktop
 create mode 100644 krebs/Zhosts/wu
 create mode 100644 krebs/Zhosts/ytart
 create mode 100644 krebs/Zhosts/zombiecancer
 create mode 100644 krebs/Zpubkeys/deploy_wu.ssh.pub
 create mode 100644 krebs/Zpubkeys/lass.ssh.pub
 create mode 100644 krebs/Zpubkeys/makefu_arch.ssh.pub
 create mode 100644 krebs/Zpubkeys/makefu_omo.ssh.pub
 create mode 100644 krebs/Zpubkeys/makefu_tsp.ssh.pub
 create mode 100644 krebs/Zpubkeys/mv_vod.ssh.pub
 create mode 100644 krebs/Zpubkeys/tv_wu.ssh.pub
 create mode 100644 krebs/Zpubkeys/uriel.ssh.pub

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 65ebad7b8..5f338df62 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -303,11 +303,11 @@ let
     };
     users = addNames {
       lass = {
-        pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
+        pubkey = readFile ../Zpubkeys/lass.ssh.pub;
         mail = "lass@mors.retiolum";
       };
       uriel = {
-        pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
+        pubkey = readFile ../Zpubkeys/uriel.ssh.pub;
         mail = "lass@uriel.retiolum";
       };
     };
@@ -514,7 +514,7 @@ let
     users = addNames {
       makefu = {
         mail = "makefu@pornocauster.retiolum";
-        pubkey = readFile ../../Zpubkeys/makefu_arch.ssh.pub;
+        pubkey = readFile ../Zpubkeys/makefu_arch.ssh.pub;
       };
     };
   };
@@ -685,11 +685,11 @@ let
     users = addNames {
       mv = {
         mail = "mv@cd.retiolum";
-        pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub;
+        pubkey = readFile ../Zpubkeys/mv_vod.ssh.pub;
       };
       tv = {
         mail = "tv@wu.retiolum";
-        pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
+        pubkey = readFile ../Zpubkeys/tv_wu.ssh.pub;
       };
     };
   };
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 481d6565c..4e70b78aa 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -58,7 +58,7 @@ let
 
     hosts = mkOption {
       type = with types; either package path;
-      default = ../../Zhosts;
+      default = ../Zhosts;
       description = ''
         If a path is given, then it will be used to generate an ad-hoc package.
       '';
diff --git a/krebs/Zhosts/Styx b/krebs/Zhosts/Styx
new file mode 100644
index 000000000..fad453168
--- /dev/null
+++ b/krebs/Zhosts/Styx
@@ -0,0 +1,10 @@
+Subnet = 10.243.0.42/32
+Compression = 9
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA4jbOi+HZIGOGNm4aBSwnq4m3Vg3IXHmYUbJx1AzP4a/yvEgswfk6
+MP5FXvoY/hZ0NQ0IRzbbJxGbcUdulz0WSjX1C+8uQUZstz+lvYZ4FeCXcdE5cuFM
+ROKAbA4qxO3WOFhPAs4G+K6srDqswmmBSfgPAfOBexEZxHweoBQLOYKUPnBCWf5q
+I1gKWgMVWv6KY/pgYxloarycb8gEd2GsNZcNwoNhRd2G/Tn6idh1qRBI96eaasbV
+P24FEVkPVFVgIGrvFZCICCeQzA4g+Sn4TmgxnTWLQxG4hAHOZQX/ld8u7NHTU9Qm
+PwmjESwfas9Z8UjknrbcaZvuqKrnMp7JwwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/ThinkArmageddon b/krebs/Zhosts/ThinkArmageddon
new file mode 100644
index 000000000..e51e1c92b
--- /dev/null
+++ b/krebs/Zhosts/ThinkArmageddon
@@ -0,0 +1,9 @@
+Subnet = 10.243.0.137/32
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1EAiyBWICkyB1zHE31fHSbGR1nJJmXSfnrqm9yXRZSGweIKrbsof
+QVcRzM4vsFBRUMBeKW7fzlGcvgXULFRnGelvEl4GRiBMO9odBlBI3t8CjZW7X2N7
+JqCMkB+CRuiHbNYQdRFTozQEfPq+DNh8accD5LjUM6gF0dKUdby5qNeHCfZSxU4v
+YZDRqq/haO4up6m8/S6YhnHPOSaIAu7R7hFaUeB/FPT+s5irKk6WtAiWnIdXb22q
+0zxT4+t9sWFb4V9u/MImggYQVWjk+TfF5KpihBOvExEQsSR8JJcRUJAtN4W0w2Pc
+S4/j9ArKcBj5Wf2qHcJMN5MbwUFW1oMkGwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/TriBot b/krebs/Zhosts/TriBot
new file mode 100644
index 000000000..821046f5d
--- /dev/null
+++ b/krebs/Zhosts/TriBot
@@ -0,0 +1,11 @@
+Subnet = 10.243.117.163
+Subnet = 42:ff05:504f:f27a:3534:9be1:4343:5e95
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAz8pZtvSqDEKo/8IHt71GzWa2oTqZPUv2kRoipUXbJGv3eWpkbd4n
+OpaLuY7MjUveZ39m830t5RAkgB9iChU5wurszgfLrxJ15uibJe+yFJl9O6kuYJr1
+69s12F/v/pPno5eWuXWJ+CdMW8srZB1I/ZIL1/GaptuDoMxu7uBnDbL/NJrpPBSr
+JxCJGHET8jh2++B3cqsBWNGkQjQTM8NwwAup6HQjBrbOQYOAQbcOTMmalc/9JFfO
+LUz63LrCPk5pIeLi+876IdAJBuJsVWwmTbl/D9R6D34Z8bYHIv9mDmO/omckcxX2
+JJgEq5/xlLb2gHt/qfUunbYHIstp/s2bSwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/ach b/krebs/Zhosts/ach
new file mode 100644
index 000000000..7774f17c4
--- /dev/null
+++ b/krebs/Zhosts/ach
@@ -0,0 +1,11 @@
+Subnet = 10.243.32.89
+Subnet = 42:6bb3:0a07:6777:9aa5:e39c:e140:cb68
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAsTyjNQ5aO2aIKXgkgZSiUb0POtEVoAPFrIkSv5Ci+7AYv+CLXsIr
+TKBfFIg474KZ4MCrX0oA3Z66s9d2UW6mcH5JufW8siRPJvdydqaANyF6Fvk++59R
++GMKR0MGdPGfcxjaw64ChemOZx1T6ODHF7KTgaWRI+Aiz+jWsvVCSKutSwVDJTgJ
+4lub95/gbWckRY6fchkh7rSTfNXXYevbysQYdZaAR/qgquUNt23/ewlagF7uqgZt
+CQx7MHMU2quEdvIfZuUPFWe0yHBb1bZCHYxKXo6XG8I7WdUAFRuwFLTjqgSYPD1j
+EpUyU0+xxfyXB3vWrM/jcw8XKzi04wWHuQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/air b/krebs/Zhosts/air
new file mode 100644
index 000000000..f27106f0e
--- /dev/null
+++ b/krebs/Zhosts/air
@@ -0,0 +1,11 @@
+Subnet = 10.243.0.99
+Subnet = 42:32d7:b589:8ae8:57a5:4cde:f49e:851d/128
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1yNqMyy9C1O031M518kzLYLh+Ox0D2r9UgVSSb9OgpQ85ZJgl7Kb
+SUzlZLbC9CX4O+PmtWvZwtPfLjua9VbVOtUJTB6zTB9Oqe4hTmX0oKIgheGf1rKS
+ylOaLfSz7PaPR3zGms17F4ovLDUBG2rpOyoHJM54T9LyJbPny/t7v/fjAFqu6atK
+1RgER3j3s5oPaRPw0pYR0kiGXayZRL6q7Qc6AXMlMi22sdRI9e1YCMCyC4u1oU6U
+grw7khyPWoEaue9B7fKfG5PixRHHlrsVDdwXEVvH87+/X2IU3H3C1/pslenAQ98i
+qGNJOl2eJ9FHInQjI1cDMgFURcT6i8mGpQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/alarmpi b/krebs/Zhosts/alarmpi
new file mode 100644
index 000000000..205b0d838
--- /dev/null
+++ b/krebs/Zhosts/alarmpi
@@ -0,0 +1,11 @@
+Subnet = 10.243.124.187
+Subnet = 42:2de9:fab6:7460:2fee:9199:fa1d:70ea
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAunQOFP1mnEmsmnMYjCwbWdbGe0/hHQs2bxIdwO1RXngXgw/TBBhN
+Xlp75LzPiT0ELF5WBPVclqskT+bl+FOOITH9XDkYzm22jzeLHq3bs3YiZhwzidkO
+Xhq5pwGY4HL4o3SfFtfOHse688qqLXefoc9CfyAIKMCRRAxlzpqNVuZEg1eUcuUJ
+z6gugJj+YyA4V3JGq7GuJDiPPOMrGel0rITMlWtYYtm0jf6deYBPjo+ZogDESlez
+tBmPKNCXynSxb6cV39StUsbUQbLvHgPBrA01T+Hw1DV5eHmWoycvD4IfJqXdfMbc
+BOqRHOlErXGTG5m2EUoU0VSj75zl06gW6wIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/albi10 b/krebs/Zhosts/albi10
new file mode 100644
index 000000000..9bcca7ccd
--- /dev/null
+++ b/krebs/Zhosts/albi10
@@ -0,0 +1,11 @@
+Address = 74.122.198.15
+Subnet = 10.243.0.10
+Subnet = 42:aaa9:4ba3:8c43:bdd8:2cc8:29a0:e8e6/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0Jz5rQ7NpIQWwhDsrZHlJYAnC1k1onl2ln/6CJbdV9t3gG2hlx/9
+0SEARo6sq9fftyzzZd3iY4WK7+zRXJFXHsLmDa6mq8Mme7Yv+YHZoHPTm9c3tN3v
+laiV/qAdoi/sv43DCo7JywI2lTW1pPxuitXuud2ajd7GXuCoRqFRqLtaURorVKkW
+4j9UGpMKrEa+CV9wP5jZ57RSPQ7aMq8D4GiMqKDgUeCZnvXxpYWDOEdGNlpuUcWt
+/erC6u50/vnjUkkHx66OmkZe5AX5MmwNp2q4zC4sTh/BRhqk27AmNl5wbp0kL7/B
+hg+r0F8ckrdLc21sSU36lUIeeFa/S+A06QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/albi7 b/krebs/Zhosts/albi7
new file mode 100644
index 000000000..32cf0dc84
--- /dev/null
+++ b/krebs/Zhosts/albi7
@@ -0,0 +1,10 @@
+Subnet = 10.243.0.7/32
+Subnet = 42:6c61:6962:6137:626c:3769:000a:1337/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA+SwdWv1anjIaKSnvel9d23tgqye5RguIVfgMnjpMsqOYpFklLIa8
+4wREhVvpiArnIsoTXbKzdeCFgaAbMS6aQ701Pyv7QriVy8m3iUlgqvB/znogxN8U
+z1fqL0jAHLkQkoyZ2a6mUgHpByvUqZNcq6istYLwGnXO3JQrS7U54hHPpXbxwFY5
+0/Wli9OueG4fWaZ9skDa2Faq4c/Lngku+Iv1gBBgII1EDSsgedNWw3YBTmHDFNTZ
+SsORj2ho5nQgdvw42qEINbxpU01jK8XB+jmVEO+ixZZCsWlOeCjl9Zym4MZDRePg
+euTLTbgs/809ElM8V+EzRKSPNR2k6FrBXwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/almoehi b/krebs/Zhosts/almoehi
new file mode 100644
index 000000000..d856f682f
--- /dev/null
+++ b/krebs/Zhosts/almoehi
@@ -0,0 +1,11 @@
+Subnet = 10.243.239.66
+Subnet = 42:0730:2eed:2bb9:9d4b:eeb1:641c:0fe6
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAtyfcqaDrDmsBVh5w4CksDI1Hn/jDcZVyNWZlqxQojjB2SsxH1VyD
+VcpmwyzDSE87CCZPN4xjIbrc+KgjiOVSAu+8Ax4dLqVrP96s5lJUIunVcwd3lQVi
+D7Ol2zDredbXuNi3jb0qBU+/qiK9mp1vTcEXhXmCSTiXIHz0d7vkv9S0h+YgKGMJ
+xBQsyCsEI9uAeGghVwrLcwY0ea6ZJuYz0miIn9+g4D5PROxImBAJV6uvbG0cP8QG
+rLY85YYByk2qKPIXrpec4uc1A/P1+1DSl5I+GEkBBhSmQB71UYCDULfuL4Eu6mFN
+AFAPsSCk8DFo5//lULky24CEkxTtp4rcPwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/alphalabs b/krebs/Zhosts/alphalabs
new file mode 100644
index 000000000..e5f98d692
--- /dev/null
+++ b/krebs/Zhosts/alphalabs
@@ -0,0 +1,10 @@
+Subnet = 42:0:0:0:0:0:0:a1fa/128
+Subnet = 10.243.1.10/32
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjB
+DgwP8yhLcxaVy2Hk82aJvNTUrfMeB2sdt1RJHQiEPQkHthdp8Spm0Px4uTiMjmFB
+ev91xi00eCCGIKsXdh/qso1K7EDHt9MEVHOvSlkawWzoyJ6AaHStW1ElwDdGjZpl
+0YWrhx4Gk5X7pCp3LKkQJFfGtqoqGOVg2JjqK3qMsAdRo6QvYDqjFzARed/D0k55
+kcKXjBJAVxoU/CqGfS/Lr0fL8tdYgXaAXvPO9dbr1t0KyOUY2KRNBePeSvRp/etb
+H0LBPsO9F7PQiPI3DBoWCYgsuj/hBXapvwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/apfull b/krebs/Zhosts/apfull
new file mode 100644
index 000000000..c64750b84
--- /dev/null
+++ b/krebs/Zhosts/apfull
@@ -0,0 +1,11 @@
+Subnet = 10.243.138.112
+Subnet = 42:0707:afc5:96a3:8215:305e:0474:02fb
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAxNnJB29djjUFUZqM7EQ8kj+IRx/a+2fA0ZdNoUm4ar6t7kTmOc40
+GzGr0zE+QPqQ3abDk7eTmZbU3yUNiAUDzDMD+iqwKAVJnMb8pjXlGmcpdvMuxwbz
+bHeTEaVqBmF4seXlwUKL+waa2Yr1t0YsynCUte8dbcauaD9CY61QjDUP7TQBglmk
+eKq+qbFNKjzIjLQf2iXsl2+dzuFqg4OUaUD0zZJVzjNpKSz24uEK2mD9fSmS3oYF
+yzsNaOKaXr/j+1Xlosxy9Rde/o54UbtZTPYsNdhNgnXmBan4zTv/QnI67Uf9RqiK
+PHsSAkfCj/K7iAOKE/A30xYbd8eV2tPANwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/bitchctl b/krebs/Zhosts/bitchctl
new file mode 100644
index 000000000..8f188a2ae
--- /dev/null
+++ b/krebs/Zhosts/bitchctl
@@ -0,0 +1,11 @@
+Subnet = 10.243.104.101
+Subnet = 42:5ac9:c698:4d1d:6ec5:45b9:647b:a8ee
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuxd4ZU3y1ZgvI+/7mQkWBlF6VvX6ty8+iKYwmjsSUCclxz3O5DB+
+clps9k+0tQvtKlsxG3lnFQz9fd4Pj0GIuWsAdHRH/hpnb9nYSRePKWy0RBjAZRr4
+8rXqI8NOdkQiIQT8gWw3ujzw/Mau/bV6AWqi+CbeExm+J0bPW/QZlAZ4BEKFvuqK
+U8yOQ38p9s3Dpe4S5JZ3cu54j5f5JygXTZgk2ZW3frJ/JS+lRHfFlIW0ZAuTqn/u
+GD5ahHLbRZPGsG5aSR+agfOVIAHLBnDoFx6AQUr09m4zyMgPEC+Xq/DvdP/Hvuas
+RYRol9qHtNeFJViWIUOQPHypTw2a4Ev7fQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/bitchextend b/krebs/Zhosts/bitchextend
new file mode 100644
index 000000000..82d8ffa43
--- /dev/null
+++ b/krebs/Zhosts/bitchextend
@@ -0,0 +1,11 @@
+Subnet = 10.243.141.142
+Subnet = 42:f8a6:9f59:381d:eedf:d90d:8611:4a9e
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA02Zp9aYkEn5yLSaOhrmuFzObpmWdZfT5OWzE11LUeoCu4rsEZY9T
+DB93iliJpxKYuLnmI49vGfSSzqGs6B2yoh6Y60OsrYrvBSQ2Li3aTOqUTL8GpR6Y
+GivInlr6F5/T+6BEg8paau/1rwRE/r2cJ78AvG1nd+JtRL9Hl4tYPakOVIbRk3D9
+4qDtWDWZS5BdirbaO66wvYxS8ps14LRvyVkjiT7IPMXf8p6rxumXPIr3JtJ6QC/K
+DKuP95v0vztZm3U32hO92NB+mDb0XjGSOaspEl2HX45phad6GnGBPqhGpSv47xDa
+HprcO9uxkGcEhyQtCALWD8THX1SNoNHh0QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/bitchtop b/krebs/Zhosts/bitchtop
new file mode 100644
index 000000000..975575efa
--- /dev/null
+++ b/krebs/Zhosts/bitchtop
@@ -0,0 +1,11 @@
+Subnet = 10.243.12.178
+Subnet = 42:4119:cdae:6fb4:0b58:59c6:a993:17ea
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3NJmRzOn5e8FwhlcdvjIwZSvCL2eJ/lJ6E3/m/BOy7qUneMwfotE
+DarxHFxd6ccMLK8yH0fUuTC9zKVud6bw5Xfaw8BnFm8QXTr3eSwol3Lq1I8+k06I
+PZ5a3tkdK7bQxOi+v70jGyR9E/Q1D7fP6L/q9L3W2RmNivlvS5qi5LgfxiEkFvgM
+EO1FPfXwTKhBCB5LqFY4e+viyGxjZ+nK55QgacU7MMNEJN0ntvSp4pLepL29q7ZN
+wSRAjZC3PJX5QZtOOtCYAJ0QqsUv8vZPhaObwPfLvGHku2vl9E8TH+HY0DWjvrte
+E9ZjPn19RWRFExiK2KpbfTJezFULhaAQaQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/box b/krebs/Zhosts/box
new file mode 100644
index 000000000..e02f8ca67
--- /dev/null
+++ b/krebs/Zhosts/box
@@ -0,0 +1,10 @@
+Subnet = 10.243.43.43
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvUMfRZOPb/zKvALZTyxKQuzowqqJ/HW2lm/RIOKL2uoTUgVX1DJB
+fCLf66e2fHnjnStXuaMDNs1kq2gi4EyK5Q50RxVBq7XayXYqfnFwzTE+Iqape542
+vYSWKLdrxljln8a2EYU7njtcWkTpW+cJIwSHEUkDLAowF87ElQ0gBmyX4p107pow
+jg7zcYierVdQXkI7mO4g2zWsywfhwscbu5hdCp1Fw3wHFDatgyhPj1pJruKe+O3c
+AebF5yQOAsCxAk8ZcwGLmmF5xK7lAeux2Qzu1B4Pkfxi97g1GVLnX+so7PR+vvkQ
++OMzQGIWXtaOqov5q2O1N5RJzng/kCjC/QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/bridge b/krebs/Zhosts/bridge
new file mode 100644
index 000000000..db75113be
--- /dev/null
+++ b/krebs/Zhosts/bridge
@@ -0,0 +1,12 @@
+Subnet = 10.243.26.29
+Subnet = 42:927a:3d59:1cb3:29d6:1a08:78d3:812e
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEApeeMSYMuXg4o/fNHnG2ftp2WskZLrt63zhRag7U1HqYUnuPqY60d
+VVy9MBTawm6N02nC2Svm3V07ZXaRp/XsXQLx+evZcDjPjnDYgl2ZGX0ir5Cn50bm
+UzhJiMW6/J7AYvucgeAaVJ0YmIwRw6ndYGcxmXWi4TK0jSzhuSLgookWM6iJfbdB
+oaYsjiXisEvNxt7rBlCfacaHMlPhz3gr1gc4IDCwF+RAMM29NUN3OinI+/f56d7b
+/hLZWbimiwtvGVsGLiA2EIcfxQ7aD/LINu+XXMaq7f8QByXj/Lzi7456tDi3pdJg
+lyg9yqRJYt4Zle5PVejn08qiofTUmlEhnwIDAQAB
+-----END RSA PUBLIC KEY-----
+
diff --git a/krebs/Zhosts/c2ft b/krebs/Zhosts/c2ft
new file mode 100644
index 000000000..8ce0539e2
--- /dev/null
+++ b/krebs/Zhosts/c2ft
@@ -0,0 +1,10 @@
+Subnet = 42:e674:8a82:7fe4:fa51:d305:192e:846b/128
+Subnet = 42.221.17.214/32
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAqS+nvuQnAlhsGHgjKRz0nq2nj9HWwzrA96xnng6UCmkTpFyprM7b
+20vQ5wqcHFAbuZh1dOOb9G2qqsZYE6V1452YLZZLMsnxiJD8kSorHrF6kJid5JjH
+xyyqSvkXaHClQItVjo7rIn5P/Tl+BMt64KaPxpu/4GBVHkCE1apLtaVRnEq5t2DG
+htZuUqzhuLN4TQiSVC++7qY1UQotjLbAQpYxf67np5sKWMOqg5UA+ghuLeO9jpqL
+qKoh2TMzotGwlYBMXVA0jJtQu5Sq/IWKWAyk9zca2LT0W0ZZWYiTl+Ai5urbJgCV
+GvWeJCoBKteIKUHRVNK1RLDFl6/ITOu9XQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/c2fthome b/krebs/Zhosts/c2fthome
new file mode 100644
index 000000000..a8eaabc97
--- /dev/null
+++ b/krebs/Zhosts/c2fthome
@@ -0,0 +1,10 @@
+Address = samularity.mine.nu
+Subnet = 42.44.64.126/32
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA4ADumWibheOOocw3diK27ww4xfyptLZzlPcih5BJFUPOljXN33th
+1rbFwBr0QyRSad5U+/w1qlTCCqadjNdu+0RPGxbCrEqE3bUlrbES3Fw1ZtyIeuRH
+v6yTQuOzJXyceGGYJpK4JjFgFOggSH35dURDa1+x3pJECyWUAVDknWE5CS7HNufW
+bcREh18LoTUi7SGPeWauDLvVb/eeuDNJkoFj+HWpNqupFXpXUD7vQ+FBTtKO9FZu
+vd/QGYv7gkRGQfma3+2XW9fWgIfE1oS0qf4UfbycaEKMFS5Tn7li3tzCcH9Da4iB
+SsyWm1Hg1UYXccBdDYWYo+vdG59hIjmh8wIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/krebs/Zhosts/casino b/krebs/Zhosts/casino
new file mode 100644
index 000000000..e35691c3c
--- /dev/null
+++ b/krebs/Zhosts/casino
@@ -0,0 +1,11 @@
+Subnet = 10.243.0.233
+Subnet = 42:3c1f:ea16:e181:7ab2:c51a:8892:7fb7/128
+
+