From a5c3570a941822a501873eda943c017580bb2a8d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 15 Feb 2016 16:56:29 +0100
Subject: l 1 helios: add pass.nix config

---
 lass/1systems/helios.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 67e3738e..68e688b5 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -7,6 +7,7 @@ with builtins;
     ../2configs/browsers.nix
     ../2configs/programs.nix
     ../2configs/git.nix
+    ../2configs/pass.nix
     #{
     #  users.extraUsers = {
     #    root = {
-- 
cgit v1.2.3


From 869a68c7944d0c022b3785c22c0c7fd010dc4627 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 15 Feb 2016 16:56:45 +0100
Subject: l 1 helios: open up port 8000 for webtesting

---
 lass/1systems/helios.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 68e688b5..bfabbe14 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -17,6 +17,15 @@ with builtins;
     #    };
     #  };
     #}
+    {
+      krebs.iptables = {
+        tables = {
+          filter.INPUT.rules = [
+            { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; precedence = 9001; }
+          ];
+        };
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.helios;
-- 
cgit v1.2.3


From 1ab712900c5ebc9a53f9593c9e7d7424031b2073 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 15 Feb 2016 16:57:04 +0100
Subject: l 1 helios: disbale intel sna because of bugs

---
 lass/1systems/helios.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index bfabbe14..4b94e5fd 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -62,15 +62,6 @@ with builtins;
   #  SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:b8:c8:2e", NAME="et0"
   #'';
 
-  services.xserver = {
-    videoDriver = "intel";
-    vaapiDrivers = [ pkgs.vaapiIntel ];
-    deviceSection = ''
-      Option "AccelMethod" "sna"
-      BusID "PCI:0:2:0"
-    '';
-  };
-
   services.xserver.synaptics = {
     enable = true;
     twoFingerScroll = true;
-- 
cgit v1.2.3


From cadb62a9f4eda028cf318164000223c2d566131a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 15 Feb 2016 16:57:48 +0100
Subject: l 1 mors: add python test-env

---
 lass/1systems/mors.nix | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index ebce9395..26a820cf 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -96,6 +96,39 @@
     #    { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; precedence = 9998; }
     #  ];
     #}
+    {
+      containers.pythonenv = {
+        config = {
+          services.openssh.enable = true;
+          users.users.root.openssh.authorizedKeys.keys = [
+            config.krebs.users.lass.pubkey
+          ];
+
+          environment = {
+            systemPackages = with pkgs; [
+              git
+              libxml2
+              libxslt
+              libzip
+              python27Full
+              python27Packages.buildout
+              stdenv
+              zlib
+            ];
+
+            pathsToLink = [ "/include" ];
+
+            shellInit = ''
+              # help pip to find libz.so when building lxml
+              export LIBRARY_PATH=/var/run/current-system/sw/lib
+              # ditto for header files, e.g. sqlite
+              export C_INCLUDE_PATH=/var/run/current-system/sw/include
+            '';
+          };
+
+        };
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 3d638b66f0c4297db51a97ec398ba4e7393faf3d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 15 Feb 2016 16:58:04 +0100
Subject: l 1 mors: activate postgresql

---
 lass/1systems/mors.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 26a820cf..4083e0c2 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -129,6 +129,12 @@
         };
       };
     }
+    {
+      services.postgresql = {
+        enable = true;
+        authentication = "local all all ident";
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 9773b0009a71686f50a5036845196c6cb3d1a34a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:12:39 +0100
Subject: l 2 browsers: allow audio in flash browser

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

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 61016fed..eb764068 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -58,7 +58,7 @@ in {
     ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
     ( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
     ( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
-    ( createChromiumUser "flash" [ ] [ pkgs.flash ] )
+    ( createChromiumUser "flash" [ "audio" ] [ pkgs.flash ] )
   ];
 
   nixpkgs.config.packageOverrides = pkgs : {
-- 
cgit v1.2.3


From 549bc221454eae6c152983921e024af60e3fc0c1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:13:40 +0100
Subject: l 2 git: add extraction_webinterface repo

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

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 2d8ee95d..9dd8475a 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -42,6 +42,7 @@ let
       brain = {
         collaborators = with config.krebs.users; [ tv makefu ];
       };
+      extraction_webinterface = {};
     } //
     import <secrets/repos.nix> { inherit config lib pkgs; }
   );
-- 
cgit v1.2.3


From c60b83e58c6b62d00e29140bfbdc3c6f573f170e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:13:54 +0100
Subject: l 2 git: add politics-fetching repo

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

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 9dd8475a..cfd1a995 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -43,6 +43,7 @@ let
         collaborators = with config.krebs.users; [ tv makefu ];
       };
       extraction_webinterface = {};
+      politics-fetching = {};
     } //
     import <secrets/repos.nix> { inherit config lib pkgs; }
   );
-- 
cgit v1.2.3


From 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:14:27 +0100
Subject: l 2 xserver: add systemPackages PATH

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

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index c407bb59..a7e77553 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -93,11 +93,9 @@ let
   xmonad-start = pkgs.writeScriptBin "xmonad" ''
     #! ${pkgs.bash}/bin/bash
     set -efu
-    export PATH; PATH=${makeSearchPath "bin" [
-      pkgs.alsaUtils
-      pkgs.pulseaudioLight
+    export PATH; PATH=${makeSearchPath "bin" ([
       pkgs.rxvt_unicode
-    ]}:/var/setuid-wrappers
+    ] ++ config.environment.systemPackages)}:/var/setuid-wrappers
     settle() {(
       # Use PATH for a clean journal
       command=''${1##*/}
-- 
cgit v1.2.3


From 399c0c902cae6b0a2e64bf7259b3eef7ac2d341d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 14:58:59 +0100
Subject: l 1 mors: disbale broken configs

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

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index e3bb4e48..7d4cd72d 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -20,12 +20,12 @@
     ../2configs/git.nix
     #../2configs/wordpress.nix
     ../2configs/bitlbee.nix
-    ../2configs/firefoxPatched.nix
+    #../2configs/firefoxPatched.nix
     ../2configs/skype.nix
     ../2configs/teamviewer.nix
     ../2configs/libvirt.nix
     ../2configs/fetchWallpaper.nix
-    ../2configs/buildbot-standalone.nix
+    #../2configs/buildbot-standalone.nix
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3


From a1615ca432011bed447fd52d49ac1731af0c2acc Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 14:59:21 +0100
Subject: l 1 mors: postgre -> mariadb

---
 lass/1systems/mors.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 7d4cd72d..31663008 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -131,9 +131,10 @@
       };
     }
     {
-      services.postgresql = {
+      services.mysql = {
         enable = true;
-        authentication = "local all all ident";
+        package = pkgs.mariadb;
+        rootPassword = "<secrets>/mysql_rootPassword";
       };
     }
   ];
-- 
cgit v1.2.3


From bc9a4d68b905e9737098c4cdd3d7089a7feadbc2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 14:59:36 +0100
Subject: add /mnt/conf to automounted disks

---
 lass/1systems/mors.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 31663008..a7f4ee5f 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -210,6 +210,11 @@
       device = "/dev/big/public";
       fsType = "ext4";
     };
+
+    "/mnt/conf" = {
+      device = "/dev/big/conf";
+      fsType = "ext4";
+    };
   };
 
   services.udev.extraRules = ''
-- 
cgit v1.2.3


From f23bf841b760ac1d984377839d625f47830ed517 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:00:18 +0100
Subject: l 2: use inherit genid from krebs.lib

---
 lass/2configs/libvirt.nix | 3 ++-
 lass/2configs/skype.nix   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix
index 7520a0e3..a51ccae5 100644
--- a/lass/2configs/libvirt.nix
+++ b/lass/2configs/libvirt.nix
@@ -2,13 +2,14 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  inherit (config.krebs.lib) genid;
 
 in {
   virtualisation.libvirtd.enable = true;
 
   users.extraUsers = {
     libvirt = {
-      uid = lib.genid "libvirt";
+      uid = genid "libvirt";
       description = "user for running libvirt stuff";
       home = "/home/libvirt";
       useDefaultShell = true;
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
index d62a18a5..5b6da4a9 100644
--- a/lass/2configs/skype.nix
+++ b/lass/2configs/skype.nix
@@ -2,12 +2,13 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  inherit (config.krebs.lib) genid;
 
 in {
   users.extraUsers = {
     skype = {
       name = "skype";
-      uid = lib.genid "skype";
+      uid = genid "skype";
       description = "user for running skype";
       home = "/home/skype";
       useDefaultShell = true;
-- 
cgit v1.2.3


From a9ee56451db8908ef1689f1c440de21fdace5a31 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:00:52 +0100
Subject: l 5: callPackage -> pkgs.callPackage

---
 lass/5pkgs/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index fee4654a..ce29ae33 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -1,16 +1,13 @@
 { pkgs, ... }:
 
-let
-  inherit (pkgs) callPackage;
-in
 {
   nixpkgs.config.packageOverrides = rec {
     firefoxPlugins = {
-      noscript = callPackage ./firefoxPlugins/noscript.nix {};
-      ublock = callPackage ./firefoxPlugins/ublock.nix {};
-      vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+      noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {};
+      ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
+      vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
     };
-    newsbot-js = callPackage ./newsbot-js/default.nix {};
+    newsbot-js = pkgs.callPackage ./newsbot-js/default.nix {};
     xmonad-lass =
       let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
       pkgs.haskellPackages.callPackage src {};
-- 
cgit v1.2.3


From 2d9434467775fd8498fbb10817df9a0920dff070 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:01:35 +0100
Subject: l 5 xmonad-lass Main: fix xmonad errors

---
 lass/5pkgs/xmonad-lass/Main.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lass/5pkgs/xmonad-lass/Main.hs b/lass/5pkgs/xmonad-lass/Main.hs
index faaa00aa..503df3be 100644
--- a/lass/5pkgs/xmonad-lass/Main.hs
+++ b/lass/5pkgs/xmonad-lass/Main.hs
@@ -12,7 +12,6 @@ import XMonad
 import System.IO (hPutStrLn, stderr)
 import System.Environment (getArgs, withArgs, getEnv, getEnvironment)
 import System.Posix.Process (executeFile)
-import XMonad.Prompt (defaultXPConfig)
 import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
                                         , removeEmptyWorkspace)
 import XMonad.Actions.GridSelect
@@ -73,7 +72,7 @@ mainNoArgs = do
         -- $ withUrgencyHook borderUrgencyHook "magenta"
         -- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never }
         $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
-        $ defaultConfig
+        $ def
             { terminal          = myTerm
             , modMask           = mod4Mask
             , workspaces        = workspaces0
@@ -169,7 +168,7 @@ myWSConfig = myGSConfig
     }
 
 pagerConfig :: PagerConfig
-pagerConfig = defaultPagerConfig
+pagerConfig = def
     { pc_font           = myFont
     , pc_cellwidth      = 64
     --, pc_cellheight     = 36 -- TODO automatically keep screen aspect
@@ -182,13 +181,13 @@ pagerConfig = defaultPagerConfig
     where
     windowColors _ _ _ True _ = ("#ef4242","#ff2323")
     windowColors wsf m c u wf = do
-        let def = defaultWindowColors wsf m c u wf
+        let y = defaultWindowColors wsf m c u wf
         if m == False && wf == True
-            then ("#402020", snd def)
-            else def
+            then ("#402020", snd y)
+            else y
 
 wGSConfig :: GSConfig Window
-wGSConfig = defaultGSConfig
+wGSConfig = def
     { gs_cellheight = 20
     , gs_cellwidth = 192
     , gs_cellpadding = 5
-- 
cgit v1.2.3


From 5c8606e6f6b9337d6f9c1241bf0af84af9db0bdf Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:01:59 +0100
Subject: l: add 5pkgs to default.nix

---
 lass/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/default.nix b/lass/default.nix
index 69b4abaa..377708c3 100644
--- a/lass/default.nix
+++ b/lass/default.nix
@@ -3,5 +3,6 @@ _:
   imports = [
     ../krebs
     ./3modules
+    ./5pkgs
   ];
 }
-- 
cgit v1.2.3


From e1a77d240eaedafbb58a387da94c863118533574 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 18 Feb 2016 17:05:01 +0100
Subject: l 1 mors: enable elasticsearch

---
 lass/1systems/mors.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index a7f4ee5f..9f492e2c 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -137,6 +137,14 @@
         rootPassword = "<secrets>/mysql_rootPassword";
       };
     }
+    {
+      services.elasticsearch = {
+        enable = true;
+        plugins = [
+          pkgs.elasticsearchPlugins.elasticsearch_kopf
+        ];
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 472daa6a41dce774b9975d17649f7b82222543f9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 21 Feb 2016 10:56:16 +0100
Subject: l 1 prism: remove kernel workaround

---
 lass/1systems/prism.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 05b3470e..d9e54a92 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -83,10 +83,10 @@ in {
     {
       sound.enable = false;
     }
-    {
-      #workaround for server dying after 6-7h
-      boot.kernelPackages = pkgs.linuxPackages_4_2;
-    }
+    #{
+    #  #workaround for server dying after 6-7h
+    #  boot.kernelPackages = pkgs.linuxPackages_4_2;
+    #}
     {
       nixpkgs.config.allowUnfree = true;
     }
-- 
cgit v1.2.3


From c0fda459166100bc38e4dbe649203c027bb613a7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 21 Feb 2016 14:26:21 +0100
Subject: l 1 prism: add uriel to chat authorized_keys

---
 lass/1systems/prism.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index d9e54a92..32137a69 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -120,6 +120,7 @@ in {
     {
       users.users.chat.openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJJKlOeAHyi7lToCqRF/hdA2TrtVbrTUd2ayuWsXe9JWiyeyKH/LNY3SrgxCWPZSItE9VK68ghMuVYK/A8IAcgzNhzFYLDxmtsidjiOJBj2ZGsjqevoQ5HuKB/pob8CLW3dr1Rx38Any/XXxpfeO6vemCJMGLTe5gSlrCI+Tk1qNt0Rz+rke73Hwt9wW39g8X3prF2q9ryL9OFCcsoYUE7PIOV9xM1GaDFfTR4bKux7HyFKmG+rBvmJHB5OPW8UAtVZGY/FIChwlmF6QNO5Zym497bG1RCOGplaLpRXVJrmoUkZUO7EazePPxIjz2duWYqFtwl5R9YGy1+a+F58G19DS7wJHM29td117/ZANjRTxE5q/aJm2okJYOVSqhYzdhji+BWVZ5ai7cktpAdtPo++yiZN90LvogXNB64kFxVGuX52xZcA3KLKmvrd47o9k0pzO+oCoArxPFIx0YkHfy/yw7OG8Z+KLK8l9WXWBZO5TpjcydnEcRZ8OEqVhtmDh+9h1zhPphuFBtT1JPbt8m132RUy23qsNRtZ/lnnfQbrxgHPRzVuvA8o4ahOEUdvV9SYnzKb6qMFXGp25EhlcWnR4/toyG6I3paBtByeHkaxjgCuvm9Hob6f/xFr3kEJ4WXTVguyrcFgNg2EcEfdkrTMhNn9OIHEFFQ8whIBv5jlw== JuiceSSH"
+        config.krebs.users.lass-uriel.pubkey
       ];
     }
     {
-- 
cgit v1.2.3


From 2d912a9d6dec8b58411436a6e2e82c9fa152e907 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 21 Feb 2016 14:28:50 +0100
Subject: l 1 uriel: remove redundant authorized_key entry

---
 lass/1systems/uriel.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 0758164f..4e4eca21 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -15,15 +15,6 @@ with builtins;
     ../2configs/bitlbee.nix
     ../2configs/weechat.nix
     ../2configs/skype.nix
-    {
-      users.extraUsers = {
-        root = {
-          openssh.authorizedKeys.keys = map readFile [
-            ../../krebs/Zpubkeys/uriel.ssh.pub
-          ];
-        };
-      };
-    }
   ];
 
   krebs.build.host = config.krebs.hosts.uriel;
-- 
cgit v1.2.3


From ae79a451c20c8060eaa54510e9f8313e3cae2d24 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 21 Feb 2016 14:31:12 +0100
Subject: l 2 weechat: get genid from krebs.lib

---
 lass/2configs/weechat.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix
index 6a257f0b..6c234d1b 100644
--- a/lass/2configs/weechat.nix
+++ b/lass/2configs/weechat.nix
@@ -1,14 +1,16 @@
 { config, lib, pkgs, ... }:
 
-{
-  krebs.per-user.chat.packages = [
-    pkgs.weechat
-    pkgs.tmux
+let
+  inherit (config.krebs.lib) genid;
+in {
+  krebs.per-user.chat.packages = with pkgs; [
+    tmux
+    weechat
   ];
 
   users.extraUsers.chat = {
     home = "/home/chat";
-    uid = lib.genid "chat";
+    uid = genid "chat";
     useDefaultShell = true;
     createHome = true;
     openssh.authorizedKeys.keys = [
-- 
cgit v1.2.3


From afff46605b26f6d72794e644c8a83a83d3caf46a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 21 Feb 2016 14:31:43 +0100
Subject: l 2 weechat: add mosh to pkgs

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

diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix
index 6c234d1b..98f5df42 100644
--- a/lass/2configs/weechat.nix
+++ b/lass/2configs/weechat.nix
@@ -4,6 +4,7 @@ let
   inherit (config.krebs.lib) genid;
 in {
   krebs.per-user.chat.packages = with pkgs; [
+    mosh
     tmux
     weechat
   ];
-- 
cgit v1.2.3


From 137306f990e866fff93e8d908641f65c421db184 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 00:49:36 +0100
Subject: l 1 mors: deactive hangouts groups

---
 lass/1systems/mors.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 9f492e2c..01d69c40 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -328,7 +328,4 @@
     tapButtons = false;
     twoFingerScroll = true;
   };
-
-  #for google hangout
-  users.extraUsers.gm.extraGroups = [ "audio" "video" ];
 }
-- 
cgit v1.2.3


From 70b0f9c9e6205d0ec59c9d84f7e1e518ad68e61e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 00:50:01 +0100
Subject: l 2 browsers: generate id with genid

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

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index eb764068..34449d1d 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let
+  inherit (config.krebs.lib) genid;
+
   mainUser = config.users.extraUsers.mainUser;
   createChromiumUser = name: extraGroups: packages:
     {
@@ -8,6 +10,7 @@ let
         inherit name;
         inherit extraGroups;
         home = "/home/${name}";
+        uid = genid name;
         useDefaultShell = true;
         createHome = true;
       };
@@ -28,6 +31,7 @@ let
         inherit name;
         inherit extraGroups;
         home = "/home/${name}";
+        uid = genid name;
         useDefaultShell = true;
         createHome = true;
       };
-- 
cgit v1.2.3


From 527884513027153c30e64c49e3536711a26eecf3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 00:50:35 +0100
Subject: l 2 base: nixpkgs rev d0e3cc -> 77f8f35

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index d2c96fda..42229ab6 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -54,8 +54,8 @@ with config.krebs.lib;
         #secrets-common = "/home/lass/secrets/common";
         stockholm = "/home/lass/stockholm";
         nixpkgs = {
-          url = https://github.com/Lassulus/nixpkgs;
-          rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
+          url = https://github.com/NixOS/nixpkgs;
+          rev = "77f8f35d57618c1ba456d968524f2fb2c3448295";
           dev = "/home/lass/src/nixpkgs";
         };
       } // optionalAttrs config.krebs.build.host.secure {
-- 
cgit v1.2.3


From a7e406c5b9bc10d2ee59dd534d577978dfebff0f Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 00:51:22 +0100
Subject: l 2 browsers: add all browsers to audio & add wk

---
 lass/2configs/browsers.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 34449d1d..47a16d4c 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -52,16 +52,17 @@ in {
 
   environment.systemPackages = [
     (pkgs.writeScriptBin "browser-select" ''
-      BROWSER=$(echo -e "ff\ncr\nfb\ngm\nflash" | dmenu)
+      BROWSER=$(echo -e "ff\ncr\nwk\nfb\ngm\nflash" | dmenu)
       $BROWSER $@
     '')
   ];
 
   imports = [
-    ( createFirefoxUser "ff" [ "audio" ] [ ] )
+    ( createFirefoxUser "ff" [ "audio" ] [ pkgs.firefox ] )
     ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
-    ( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
-    ( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
+    ( createChromiumUser "wk" [ "audio" ] [ pkgs.chromium ] )
+    ( createChromiumUser "fb" [ "audio" ] [ pkgs.chromium ] )
+    ( createChromiumUser "gm" [ "audio" ] [ pkgs.chromium ] )
     ( createChromiumUser "flash" [ "audio" ] [ pkgs.flash ] )
   ];
 
-- 
cgit v1.2.3


From 641e7bed47d0567f654bdb2a2c55e4bd0a882fd1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 00:51:52 +0100
Subject: l 2 retiolum: don't connect to cac hosts

---
 lass/2configs/retiolum.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index f8a63706..1646cdea 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -16,8 +16,6 @@
     enable = true;
     connectTo = [
       "prism"
-      "cloudkrebs"
-      "echelon"
       "pigstarter"
       "gum"
       "flap"
-- 
cgit v1.2.3


From 2924afb8a2cb7d734b56a4a8934737129a20154c Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 00:52:15 +0100
Subject: l 3 nesbot-js: get genid from krebs.lib

---
 lass/3modules/newsbot-js.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lass/3modules/newsbot-js.nix b/lass/3modules/newsbot-js.nix
index 5e340b26..0772971d 100644
--- a/lass/3modules/newsbot-js.nix
+++ b/lass/3modules/newsbot-js.nix
@@ -4,6 +4,8 @@ with builtins;
 with lib;
 
 let
+  inherit (config.krebs.lib) genid;
+
   cfg = config.lass.newsbot-js;
 
   out = {
-- 
cgit v1.2.3


From cfe5687ca339aa7168214dc2720576d884eff41a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Feb 2016 01:13:26 +0100
Subject: k 3 lass: add .r alias to all host for exim

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

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 4bf10ac5..6220a2d6 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -19,6 +19,7 @@ with config.krebs.lib;
           addrs6 = ["42:0000:0000:0000:0000:0000:d15f:1233"];
           aliases = [
             "dishfire.retiolum"
+            "dishfire.r"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -52,6 +53,7 @@ with config.krebs.lib;
             "echelon.retiolum"
             "cgit.echelon.retiolum"
             "go.retiolum"
+            "go.r"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -83,6 +85,7 @@ with config.krebs.lib;
           addrs6 = ["42:0000:0000:0000:0000:0000:0000:15ab"];
           aliases = [
             "prism.retiolum"
+            "prism.r"
             "cgit.prism.retiolum"
           ];
           tinc.pubkey = ''
@@ -114,6 +117,7 @@ with config.krebs.lib;
           addrs6 = ["42:422a:194f:ff3b:e196:2f82:5cf5:bc00"];
           aliases = [
             "fastpoke.retiolum"
+            "fastpoke.r"
             "cgit.fastpoke.retiolum"
           ];
           tinc.pubkey = ''
@@ -144,6 +148,7 @@ with config.krebs.lib;
           addrs6 = ["42:941e:2816:35f4:5c5e:206b:3f0b:f762"];
           aliases = [
             "cloudkrebs.retiolum"
+            "cloudkrebs.r"
             "cgit.cloudkrebs.retiolum"
           ];
           tinc.pubkey = ''
@@ -173,6 +178,7 @@ with config.krebs.lib;
           addrs6 = ["42:dc25:60cf:94ef:759b:d2b6:98a9:2e56"];
           aliases = [
             "uriel.retiolum"
+            "uriel.r"
             "cgit.uriel.retiolum"
           ];
           tinc.pubkey = ''
@@ -203,6 +209,7 @@ with config.krebs.lib;
           addrs6 = ["42:0:0:0:0:0:0:dea7"];
           aliases = [
             "mors.retiolum"
+            "mors.r"
             "cgit.mors.retiolum"
           ];
           tinc.pubkey = ''
@@ -229,6 +236,7 @@ with config.krebs.lib;
           addrs6 = ["42:0:0:0:0:0:0:7105"];
           aliases = [
             "helios.retiolum"
+            "helios.r"
             "cgit.helios.retiolum"
           ];
           tinc.pubkey = ''
-- 
cgit v1.2.3


From 08627a2cd423e6853de324cfa2c1bba0c844af30 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 26 Feb 2016 16:43:36 +0100
Subject: l 1 helios: remove open ports

---
 lass/1systems/helios.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 0103b6ec..beaf0f44 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -19,12 +19,6 @@ with builtins;
     #  };
     #}
     {
-      krebs.iptables = {
-        tables = {
-          filter.INPUT.rules = [
-            { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; precedence = 9001; }
-          ];
-        };
       };
     }
   ];
-- 
cgit v1.2.3


From 02c3fabe3ac38713fe71184c66ecf86dfa295a57 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 26 Feb 2016 16:44:48 +0100
Subject: l 1 helios: enable elasticsearch

---
 lass/1systems/helios.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index beaf0f44..2784375c 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -19,6 +19,11 @@ with builtins;
     #  };
     #}
     {
+      services.elasticsearch = {
+        enable = true;
+        plugins = [
+          pkgs.elasticsearchPlugins.elasticsearch_kopf
+        ];
       };
     }
   ];
-- 
cgit v1.2.3


From 1ae75d5408d771fb880cb1b6d503dba82619fbc1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 26 Feb 2016 16:45:13 +0100
Subject: l 1 prism: update JuiceSSH key

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

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 32137a69..864e59b2 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -119,7 +119,7 @@ in {
     }
     {
       users.users.chat.openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJJKlOeAHyi7lToCqRF/hdA2TrtVbrTUd2ayuWsXe9JWiyeyKH/LNY3SrgxCWPZSItE9VK68ghMuVYK/A8IAcgzNhzFYLDxmtsidjiOJBj2ZGsjqevoQ5HuKB/pob8CLW3dr1Rx38Any/XXxpfeO6vemCJMGLTe5gSlrCI+Tk1qNt0Rz+rke73Hwt9wW39g8X3prF2q9ryL9OFCcsoYUE7PIOV9xM1GaDFfTR4bKux7HyFKmG+rBvmJHB5OPW8UAtVZGY/FIChwlmF6QNO5Zym497bG1RCOGplaLpRXVJrmoUkZUO7EazePPxIjz2duWYqFtwl5R9YGy1+a+F58G19DS7wJHM29td117/ZANjRTxE5q/aJm2okJYOVSqhYzdhji+BWVZ5ai7cktpAdtPo++yiZN90LvogXNB64kFxVGuX52xZcA3KLKmvrd47o9k0pzO+oCoArxPFIx0YkHfy/yw7OG8Z+KLK8l9WXWBZO5TpjcydnEcRZ8OEqVhtmDh+9h1zhPphuFBtT1JPbt8m132RUy23qsNRtZ/lnnfQbrxgHPRzVuvA8o4ahOEUdvV9SYnzKb6qMFXGp25EhlcWnR4/toyG6I3paBtByeHkaxjgCuvm9Hob6f/xFr3kEJ4WXTVguyrcFgNg2EcEfdkrTMhNn9OIHEFFQ8whIBv5jlw== JuiceSSH"
+        "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFhFJUMTfPbv3SzqlT9S67Av/m/ctLfTd3mMhD4O9hZc+t+dZmaHWj3v1KujzMBiDp3Yfo2YdVVZLTwTluHD8yNoQH418Vm01nrYHwOsc5J0br3mb0URZSstPiz6/6Fc+PNCDfQ2skUAWUidWiH+JolROFQ4y2lfpLOw+wsK2jj+Gqx6w== JuiceSSH"
         config.krebs.users.lass-uriel.pubkey
       ];
     }
-- 
cgit v1.2.3


From 61f2ea55e27e1649ea6ed23c11321e1cfeff0424 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 26 Feb 2016 16:45:39 +0100
Subject: l 2 base: nixpkgs rev 77f8f35 -> 885acea

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 42229ab6..af4ee6d2 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -55,7 +55,7 @@ with config.krebs.lib;
         stockholm = "/home/lass/stockholm";
         nixpkgs = {
           url = https://github.com/NixOS/nixpkgs;
-          rev = "77f8f35d57618c1ba456d968524f2fb2c3448295";
+          rev = "885acea1dd82b0354ff2b6bcf1268b3031cf93df";
           dev = "/home/lass/src/nixpkgs";
         };
       } // optionalAttrs config.krebs.build.host.secure {
-- 
cgit v1.2.3


From 00f61dc6b8f89f3b584669960f5211c50104d4da Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 27 Feb 2016 15:50:30 +0100
Subject: l 1 mors: disable sna acceleration

---
 lass/1systems/mors.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 01d69c40..dc09c9d3 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -270,14 +270,14 @@
     emulateWheel = true;
   };
 
-  services.xserver = {
-    videoDriver = "intel";
-    vaapiDrivers = [ pkgs.vaapiIntel ];
-    deviceSection = ''
-      Option "AccelMethod" "sna"
-      BusID "PCI:0:2:0"
-    '';
-  };
+  #services.xserver = {
+  #  videoDriver = "intel";
+  #  vaapiDrivers = [ pkgs.vaapiIntel ];
+  #  deviceSection = ''
+  #    Option "AccelMethod" "sna"
+  #    BusID "PCI:0:2:0"
+  #  '';
+  #};
 
   environment.systemPackages = with pkgs; [
     cac-api
-- 
cgit v1.2.3


From acd5d7cceeeb96c182a963ba0c564821a36c8938 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 27 Feb 2016 15:51:25 +0100
Subject: l 2 base: add krebspate to pkgs

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index af4ee6d2..53983175 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -104,6 +104,9 @@ with config.krebs.lib;
 
   #stuff for dl
     aria2
+
+  #neat utils
+    krebspaste
   ];
 
   programs.bash = {
-- 
cgit v1.2.3


From efa2eb3331652c93499774adaf5092439cce92bc Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 2 Mar 2016 21:39:36 +0100
Subject: l 1 mors: disable kopf in ES

---
 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 dc09c9d3..5c5c3530 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -141,7 +141,7 @@
       services.elasticsearch = {
         enable = true;
         plugins = [
-          pkgs.elasticsearchPlugins.elasticsearch_kopf
+        #  pkgs.elasticsearchPlugins.elasticsearch_kopf
         ];
       };
     }
-- 
cgit v1.2.3


From cc2d6843bfb564ec5876ea79e6647b0093b07f96 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 2 Mar 2016 21:40:02 +0100
Subject: l 2 base: nixpkgs rev 885acea -> 40c586b

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

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 53983175..51a6d9da 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -55,7 +55,7 @@ with config.krebs.lib;
         stockholm = "/home/lass/stockholm";
         nixpkgs = {
           url = https://github.com/NixOS/nixpkgs;
-          rev = "885acea1dd82b0354ff2b6bcf1268b3031cf93df";
+          rev = "40c586b7ce2c559374df435f46d673baf711c543";
           dev = "/home/lass/src/nixpkgs";
         };
       } // optionalAttrs config.krebs.build.host.secure {
-- 
cgit v1.2.3


From f3edfbeb1102ce7c109bab88dfc68819c5d1f701 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 2 Mar 2016 21:51:46 +0100
Subject: l 2: add cbase config

---
 lass/2configs/cbase.nix | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 lass/2configs/cbase.nix

diff --git a/lass/2configs/cbase.nix b/lass/2configs/cbase.nix
new file mode 100644
index 00000000..9d13bc30
--- /dev/null
+++ b/lass/2configs/cbase.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (config.krebs.lib) genid;
+
+in {
+
+  users.extraUsers = {
+    cbasevpn = rec {
+      name = "cbasevpn";
+      uid = genid "cbasevpn";
+      description = "user for running c-base openvpn";
+      home = "/home/${name}";
+    };
+  };
+
+  users.extraGroups.cbasevpn.gid = genid "cbasevpn";
+
+  services.openvpn.servers = {
+    c-base = {
+      config = ''
+        client
+        dev tap
+        proto tcp
+        remote vpn.ext.c-base.org 1194
+        resolv-retry infinite
+        nobind
+        user cbasevpn
+        group cbasevpn
+        persist-key
+        persist-tun
+
+        auth-nocache
+        #auth-user-pass
+        auth-user-pass ${toString <secrets/cbase.txt>}
+
+        comp-lzo
+        verb 3
+
+        #script-security 2
+        #up /etc/openvpn/update-resolv-conf
+        #down /etc/openvpn/update-resolv-conf
+
+        <ca>
+        -----BEGIN CERTIFICATE-----
+        MIIDUjCCArugAwIBAgIJAOOk8EXgjsf5MA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+        BAYTAkRFMQswCQYDVQQIEwJERTEPMA0GA1UEBxMGQmVybGluMQ8wDQYDVQQKEwZj
+        LWJhc2UxGzAZBgNVBAMTEnZwbi5leHQuYy1iYXNlLm9yZzEfMB0GCSqGSIb3DQEJ
+        ARYQYWRtYXhAYy1iYXNlLm9yZzAeFw0wOTAyMTMwOTE1MzdaFw0xOTAyMTEwOTE1
+        MzdaMHoxCzAJBgNVBAYTAkRFMQswCQYDVQQIEwJERTEPMA0GA1UEBxMGQmVybGlu
+        MQ8wDQYDVQQKEwZjLWJhc2UxGzAZBgNVBAMTEnZwbi5leHQuYy1iYXNlLm9yZzEf
+        MB0GCSqGSIb3DQEJARYQYWRtYXhAYy1iYXNlLm9yZzCBnzANBgkqhkiG9w0BAQEF
+        AAOBjQAwgYkCgYEAt3wEgXbqFKxs8z/E4rv13hkRi6J+QdshNzntm7rTOmUsXKE7
+        IEwoJSglrmsDPv4UqE86A7bjW7YYSFjhzxFRkTEHJanyOCF48ZPItVl7Eq7T81co
+        uR+6lAhxnLDrwnPJCC83NzAa6lw8U1DsQRDkayKlrQrtZq6++pFFEvZvt1cCAwEA
+        AaOB3zCB3DAdBgNVHQ4EFgQUqkSbdXS90+HtqXDeAI+PcyTSSHEwgawGA1UdIwSB
+        pDCBoYAUqkSbdXS90+HtqXDeAI+PcyTSSHGhfqR8MHoxCzAJBgNVBAYTAkRFMQsw
+        CQYDVQQIEwJERTEPMA0GA1UEBxMGQmVybGluMQ8wDQYDVQQKEwZjLWJhc2UxGzAZ
+        BgNVBAMTEnZwbi5leHQuYy1iYXNlLm9yZzEfMB0GCSqGSIb3DQEJARYQYWRtYXhA
+        Yy1iYXNlLm9yZ4IJAOOk8EXgjsf5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+        BQADgYEAOBANG1H4uEEWk3sbeQoSMeA3LFG1+6MgFGk2WAdeHYuV9GKYBq6/PLP5
+        ffw+FNkiDjLSeSQO88vHYJr2V1v8n/ZoCIT+1VBcDWXTpGz0YxDI1iBauO3tUPzK
+        wGs46RA/S0YwiZw64MaUHd88ZVadjKy9kNoO3w6/vpAS6s/Mh+o=
+        -----END CERTIFICATE-----
+        </ca>
+        key-direction 1
+        <tls-auth>
+        #
+        # 2048 bit OpenVPN static key
+        #
+        -----BEGIN OpenVPN Static key V1-----
+        5d49aa8c9cec18de7ab6e0b5cd09a368
+        d3f1b8b77e055e448804fa0e14f487cb
+        491681742f96b54a23fb8639aa9ed14e
+        c40b86a5546b888c4f3873f23c956e87
+        169076ec869127ffc85353fd5928871c
+        da19776b79f723abb366fae6cdfe4ad6
+        7ef667b7d05a7b78dfd5ea1d2da276dc
+        5f6c82313fe9c1178c7256b8d1d081b0
+        4c80bc8f21add61fbc52c158579edc1d
+        bbde230afb9d0e531624ce289a17098a
+        3261f9144a9a2a6f0da4250c9eed4086
+        187ec6fa757a454de743a349e32af193
+        e9f8b49b010014bdfb3240d992f2f234
+        581d0ce05d4e07a2b588ad9b0555b704
+        9d5edc28efde59226ec8942feed690a1
+        2acd0c8bc9424d6074d0d495391023b6
+        -----END OpenVPN Static key V1-----
+        </tls-auth>
+      '';
+    };
+  };
+}
-- 
cgit v1.2.3


From 6570fa8d8657c577e18225dfd860bce2e4c5e7df Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 2 Mar 2016 21:52:02 +0100
Subject: l 1 mors: import cbase.nix

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

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 5c5c3530..b95e61a5 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -25,6 +25,7 @@
     ../2configs/teamviewer.nix
     ../2configs/libvirt.nix
     ../2configs/fetchWallpaper.nix
+    ../2configs/cbase.nix
     #../2configs/buildbot-standalone.nix
     {
       #risk of rain port
-- 
cgit v1.2.3


From 1ba917c3337c9a954e5c251b137ea3ea2ce62f81 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 2 Mar 2016 23:09:19 +0100
Subject: k 3 nginx: add ssl options

---
 krebs/3modules/nginx.nix | 58 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix
index ec39715d..023988dd 100644
--- a/krebs/3modules/nginx.nix
+++ b/krebs/3modules/nginx.nix
@@ -39,6 +39,34 @@ let
             type = with types; string;
             default = "";
           };
+          ssl = mkOption {
+            type = with types; submodule ({
+              options = {
+                enable = mkEnableOption "ssl";
+                certificate = mkOption {
+                  type = str;
+                };
+                certificate_key = mkOption {
+                  type = str;
+                };
+                #TODO: check for valid cipher
+                ciphers = mkOption {
+                  type = str;
+                  default = "AES128+EECDH:AES128+EDH";
+                };
+                prefer_server_ciphers = mkOption {
+                  type = bool;
+                  default = true;
+                };
+                protocols = mkOption {
+                  type = listOf (enum [ "SSLv2" "SSLv3" "TLSv1" "TLSv1.1" "TLSv1.2" ]);
+                  default = [ "TLSv1.1" "TLSv1.2" ];
+
+                };
+              };
+            });
+            default = {};
+          };
         };
       });
       default = {};
@@ -73,14 +101,28 @@ let
     }
   '';
 
-  to-server = { server-names, listen, locations, extraConfig, ... }: ''
-    server {
-      ${concatMapStringsSep "\n" (x: "listen ${x};") listen}
-      server_name ${toString server-names};
-      ${indent extraConfig}
-      ${indent (concatMapStrings to-location locations)}
-    }
-  '';
+  to-server = { server-names, listen, locations, extraConfig, ssl, ... }:
+    let
+      _extraConfig = if ssl.enable then
+        extraConfig + ''
+          ssl_certificate ${ssl.certificate};
+          ssl_certificate_key ${ssl.certificate_key};
+          ${optionalString ssl.prefer_server_ciphers "ssl_prefer_server_ciphers On;"}
+          ssl_ciphers ${ssl.ciphers};
+          ssl_protocols ${toString ssl.protocols};
+        ''
+      else
+        extraConfig
+      ;
+
+    in ''
+      server {
+        ${concatMapStringsSep "\n" (x: "listen ${x};") (listen ++ optional ssl.enable "443 ssl")}
+        server_name ${toString server-names};
+        ${indent _extraConfig}
+        ${indent (concatMapStrings to-location locations)}
+      }
+    '';
 
 in
 out
-- 
cgit v1.2.3


From 20025f7b1241aa236cbad847264b77436812104e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:45:57 +0100
Subject: l 1 prism: enable tor client

---
 lass/1systems/prism.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 864e59b2..4d40c8d5 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -135,6 +135,12 @@ in {
          { predicate = "-p tcp --dport 80"; target = "ACCEPT"; }
       ];
     }
+    {
+      services.tor = {
+        enable = true;
+        client.enable = true;
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From 5f800d02e8345a41ef1e74dd0dbbb291916311f7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:50:44 +0100
Subject: l 2 vim: add fugitive & unimpared to vim plugins

---
 lass/2configs/vim.nix | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 3fe45e1d..fe5405bc 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -1,13 +1,24 @@
 { config, pkgs, ... }:
 
 let
-  customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin {
-    name = "Mustang2";
-    src = pkgs.fetchFromGitHub {
-      owner = "croaker";
-      repo = "mustang-vim";
-      rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5";
-      sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67";
+  customPlugins = {
+    mustang2 = pkgs.vimUtils.buildVimPlugin {
+      name = "Mustang2";
+      src = pkgs.fetchFromGitHub {
+        owner = "croaker";
+        repo = "mustang-vim";
+        rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5";
+        sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67";
+      };
+    };
+    unimpaired = pkgs.vimUtils.buildVimPlugin {
+      name = "unimpaired-vim";
+      src = pkgs.fetchFromGitHub {
+        owner = "tpope";
+        repo = "vim-unimpaired";
+        rev = "11dc568dbfd7a56866a4354c737515769f08e9fe";
+        sha256 = "1an941j5ckas8l3vkfhchdzjwcray16229rhv3a1d4pbxifwshi8";
+      };
     };
   };
 
@@ -105,11 +116,24 @@ in {
 
       "esc timeout
       set timeoutlen=1000 ttimeoutlen=0
+
+      "foldfunctions
+      inoremap <F9> <C-O>za
+      nnoremap <F9> za
+      onoremap <F9> <C-C>za
+      vnoremap <F9> zf
     '';
 
       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
-        { names = [ "Gundo" "commentary" "mustang2" ]; }
+        { names = [
+          "Gundo"
+          "commentary"
+          "mustang2"
+          "extradite"
+          "fugitive"
+          "unimpaired"
+        ]; }
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
 
-- 
cgit v1.2.3


From fde8731ad112d0ec8c64cf77c339c7c25664f96c Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:52:23 +0100
Subject: l 2 vim: remove trailing whitespace

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

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index fe5405bc..961238b0 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -67,7 +67,8 @@ in {
       vnoremap < <gv
       vnoremap > >gv
 
-      nmap <esc>q :buffer 
+      nmap <esc>q :buffer
+
 
       "Tabwidth
       set ts=2 sts=2 sw=2 et
-- 
cgit v1.2.3


From a973f194b8dc824a2144da7da736d5085bb6d462 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:52:54 +0100
Subject: l 2 xserver: disable autorestarting of xmonad

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

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 203ed0b0..48bd31bf 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -49,7 +49,7 @@ let
     services.xserver.enable = true;
 
     systemd.services.xmonad = {
-      wantedBy = [ "multi-user.target" ];
+      #wantedBy = [ "multi-user.target" ];
       requires = [ "xserver.service" ];
       environment = xmonad-environment;
       serviceConfig = {
-- 
cgit v1.2.3


From 81c047edfd3491b5404bc0ed1f6a4385851e4443 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 7 Mar 2016 13:16:30 +0100
Subject: l 1 helios: disable kopf plugin for ES

---
 lass/1systems/helios.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 2784375c..cc98c2c5 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -21,9 +21,6 @@ with builtins;
     {
       services.elasticsearch = {
         enable = true;
-        plugins = [
-          pkgs.elasticsearchPlugins.elasticsearch_kopf
-        ];
       };
     }
   ];
-- 
cgit v1.2.3


From 2bc6d70feb5b5f2421d086009d64f3c9f840f6d4 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 7 Mar 2016 13:16:57 +0100
Subject: l 2 vim: use brogrammer theme

---
 lass/2configs/vim.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 961238b0..7e7296c9 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -20,6 +20,15 @@ let
         sha256 = "1an941j5ckas8l3vkfhchdzjwcray16229rhv3a1d4pbxifwshi8";
       };
     };
+    brogrammer = pkgs.vimUtils.buildVimPlugin {
+      name = "brogrammer";
+      src = pkgs.fetchFromGitHub {
+        owner = "marciomazza";
+        repo = "vim-brogrammer-theme";
+        rev = "3e412d8e8909d8d89eb5a4cbe955b5bc0833a3c3";
+        sha256 = "0am1qk8ls74z5ipgf9viacayq08y9i9vd7sxxiivwgsjh2ancbv6";
+      };
+    };
   };
 
 in {
@@ -34,7 +43,7 @@ in {
       syntax on
       " TODO autoload colorscheme file
       set background=dark
-      colorscheme mustang
+      colorscheme brogrammer
       filetype off
       filetype plugin indent on
 
@@ -134,6 +143,7 @@ in {
           "extradite"
           "fugitive"
           "unimpaired"
+          "brogrammer"
         ]; }
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
-- 
cgit v1.2.3


From a9a736c5f801dc2a9e6b764a5d20a2e5349ccf9d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 7 Mar 2016 13:17:19 +0100
Subject: l 2 xserver: disable xmonad restart on change

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

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 48bd31bf..30afd787 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -49,9 +49,10 @@ let
     services.xserver.enable = true;
 
     systemd.services.xmonad = {
-      #wantedBy = [ "multi-user.target" ];
+      wantedBy = [ "multi-user.target" ];
       requires = [ "xserver.service" ];
       environment = xmonad-environment;
+      restartIfChanged = false;
       serviceConfig = {
         ExecStart = "${xmonad-start}/bin/xmonad";
         ExecStop = "${xmonad-stop}/bin/xmonad-stop";
-- 
cgit v1.2.3


From 6d84a00fa6252c510e67863f72fbba094bd1e51e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 13:22:56 +0100
Subject: k 3 l: add .r alias to echelon

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

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 6220a2d6..14846073 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -51,6 +51,7 @@ with config.krebs.lib;
           addrs6 = ["42:941e:2816:35f4:5c5e:206b:3f0b:f763"];
           aliases = [
             "echelon.retiolum"
+            "echelon.r"
             "cgit.echelon.retiolum"
             "go.retiolum"
             "go.r"
-- 
cgit v1.2.3


From 8e42e8667ee304f6bc39c32dce35112580bcbc54 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 13:25:15 +0100
Subject: l 2 base: MANPAGER=most PAGER=less

---
 lass/2configs/base.nix | 2 +-
 lass/2configs/zsh.nix  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 51a6d9da..55784277 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -81,7 +81,7 @@ with config.krebs.lib;
   # multiple-definition-problem when defining environment.variables.EDITOR
   environment.extraInit = ''
     EDITOR=vim
-    PAGER=most
+    MANPAGER=most
   '';
 
   environment.systemPackages = with pkgs; [
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index 64aa4582..7299e9ac 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -54,10 +54,6 @@
 
       #eval $( dircolors -b ~/.LS_COLORS )
 
-      #exports
-      export EDITOR='vim'
-      export MANPAGER='most'
-      export PAGER='vim -R -'
       # export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
 
       #beautiful colors
-- 
cgit v1.2.3


From fe0bb6c0f57263c1e6ed526566fc4f11dd113492 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 14:00:55 +0100
Subject: l 2 retiolum: use tinc_pre

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

diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 1646cdea..89e0f217 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -21,4 +21,8 @@
       "flap"
     ];
   };
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    tinc = pkgs.tinc_pre;
+  };
 }
-- 
cgit v1.2.3


From bf8a0c66f9db05693b0bce439ef628f9b9a4c832 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 14:05:09 +0100
Subject: l 1 mors: activate postgresql

---
 lass/1systems/mors.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index b95e61a5..20b885b5 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -146,6 +146,12 @@
         ];
       };
     }
+    {
+      services.postgresql = {
+        enable = true;
+        package = pkgs.postgresql;
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From f00acd3ad18beae3e38e6d0bbb3de76ff5a8a2d5 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 14:08:29 +0100
Subject: l 5: add acronym

---
 lass/5pkgs/acronym/default.nix | 13 +++++++++++++
 lass/5pkgs/default.nix         |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 lass/5pkgs/acronym/default.nix

diff --git a/lass/5pkgs/acronym/default.nix b/lass/5pkgs/acronym/default.nix
new file mode 100644
index 00000000..53d5d015
--- /dev/null
+++ b/lass/5pkgs/acronym/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+pkgs.writeScriptBin "acronym" ''
+  #! ${pkgs.bash}/bin/bash
+
+  acro=$1
+
+  curl -s http://www.acronymfinder.com/$acro.html \
+  | grep 'class="result-list__body__rank"' \
+  | sed 's/.*title="\([^"]*\)".*/\1/' \
+  | sed 's/^.* - //' \
+  | sed "s/&#39;/'/g"
+''
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index ce29ae33..500ff910 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -2,6 +2,7 @@
 
 {
   nixpkgs.config.packageOverrides = rec {
+    acronym = pkgs.callPackage ./acronym/default.nix {};
     firefoxPlugins = {
       noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {};
       ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
-- 
cgit v1.2.3


From 00eed553e55bd07400f7fd880b6f5c25cd6a7df6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 14:12:13 +0100
Subject: l 1 mors: add acronym to pkgs

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

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 20b885b5..1f7a13c5 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -287,6 +287,7 @@
   #};
 
   environment.systemPackages = with pkgs; [
+    acronym
     cac-api
     sshpass
     get
-- 
cgit v1.2.3


From 5a3c98aec7ff1755daa4b9cc647c2bbe0b8ba036 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 14:26:51 +0100
Subject: l 5 newsbot-js -> k 5 newsbot-js

---
 krebs/5pkgs/newsbot-js/default.nix  |   60 ++
 krebs/5pkgs/newsbot-js/packages.nix | 1442 +++++++++++++++++++++++++++++++++++
 lass/5pkgs/default.nix              |    1 -
 lass/5pkgs/newsbot-js/default.nix   |   60 --
 lass/5pkgs/newsbot-js/packages.nix  | 1442 -----------------------------------
 5 files changed, 1502 insertions(+), 1503 deletions(-)
 create mode 100644 krebs/5pkgs/newsbot-js/default.nix
 create mode 100644 krebs/5pkgs/newsbot-js/packages.nix
 delete mode 100644 lass/5pkgs/newsbot-js/default.nix
 delete mode 100644 lass/5pkgs/newsbot-js/packages.nix

diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/newsbot-js/default.nix
new file mode 100644
index 00000000..cabd7422
--- /dev/null
+++ b/krebs/5pkgs/newsbot-js/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }:
+
+with lib;
+
+let
+  np = nodePackages.override {
+    generated = ./packages.nix;
+    self = np;
+  };
+
+  node_env = buildEnv {
+    name = "node_env";
+    paths = [
+      np.feedparser
+      np.form-data
+      np.irc
+      np.request
+      np.shell-quote
+    ];
+    pathsToLink = [ "/lib" ];
+    ignoreCollisions = true;
+  };
+
+in nodePackages.buildNodePackage {
+  name = "newsbot-js";
+
+  src = fetchgit {
+    url = "http://cgit.echelon/newsbot-js/";
+    rev = "802b172d0eed6c9625a9cb5db408f5cc8c01784e";
+    sha256 = "794fc7845aca311f7cf7b6bdc109b5a25d0e2299322bc6612edadc477b2536e2";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  deps = (filter (v: nixType v == "derivation") (attrValues np));
+
+  buildInputs = [
+    nodejs
+    makeWrapper
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp newsbot.js $out/
+    cat > $out/newsbot << EOF
+      ${nodejs}/bin/node $out/newsbot.js
+    EOF
+    chmod +x $out/newsbot
+
+    wrapProgram $out/newsbot \
+      --prefix NODE_PATH : ${node_env}/lib/node_modules
+
+     ln -s $out/newsbot /$out/bin/newsbot
+  '';
+
+}
diff --git a/krebs/5pkgs/newsbot-js/packages.nix b/krebs/5pkgs/newsbot-js/packages.nix
new file mode 100644
index 00000000..982a9d55
--- /dev/null
+++ b/krebs/5pkgs/newsbot-js/packages.nix
@@ -0,0 +1,1442 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."addressparser"."~0.1.3" =
+    self.by-version."addressparser"."0.1.3";
+  by-version."addressparser"."0.1.3" = self.buildNodePackage {
+    name = "addressparser-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
+      name = "addressparser-0.1.3.tgz";
+      sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-color"."0.2.1" =
+    self.by-version."ansi-color"."0.2.1";
+  by-version."ansi-color"."0.2.1" = self.buildNodePackage {
+    name = "ansi-color-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
+      name = "ansi-color-0.2.1.tgz";
+      sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^2.0.0" =
+    self.by-version."ansi-regex"."2.0.0";
+  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
+    name = "ansi-regex-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+      name = "ansi-regex-2.0.0.tgz";
+      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-styles"."^2.1.0" =
+    self.by-version."ansi-styles"."2.1.0";
+  by-version."ansi-styles"."2.1.0" = self.buildNodePackage {
+    name = "ansi-styles-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+      name = "ansi-styles-2.1.0.tgz";
+      sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-filter"."~0.0.0" =
+    self.by-version."array-filter"."0.0.1";
+  by-version."array-filter"."0.0.1" = self.buildNodePackage {
+    name = "array-filter-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
+      name = "array-filter-0.0.1.tgz";
+      sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-indexofobject"."~0.0.1" =
+    self.by-version."array-indexofobject"."0.0.1";
+  by-version."array-indexofobject"."0.0.1" = self.buildNodePackage {
+    name = "array-indexofobject-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
+      name = "array-indexofobject-0.0.1.tgz";
+      sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-map"."~0.0.0" =
+    self.by-version."array-map"."0.0.0";
+  by-version."array-map"."0.0.0" = self.buildNodePackage {
+    name = "array-map-0.0.0";
+    version = "0.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
+      name = "array-map-0.0.0.tgz";
+      sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-reduce"."~0.0.0" =
+    self.by-version."array-reduce"."0.0.0";
+  by-version."array-reduce"."0.0.0" = self.buildNodePackage {
+    name = "array-reduce-0.0.0";
+    version = "0.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
+      name = "array-reduce-0.0.0.tgz";
+      sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asn1"."0.1.11" =
+    self.by-version."asn1"."0.1.11";
+  by-version."asn1"."0.1.11" = self.buildNodePackage {
+    name = "asn1-0.1.11";
+    version = "0.1.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+      name = "asn1-0.1.11.tgz";
+      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus"."^0.1.5" =
+    self.by-version."assert-plus"."0.1.5";
+  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
+    name = "assert-plus-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+      name = "assert-plus-0.1.5.tgz";
+      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."^1.4.0" =
+    self.by-version."async"."1.4.2";
+  by-version."async"."1.4.2" = self.buildNodePackage {
+    name = "async-1.4.2";
+    version = "1.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
+      name = "async-1.4.2.tgz";
+      sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws-sign2"."~0.5.0" =
+    self.by-version."aws-sign2"."0.5.0";
+  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
+    name = "aws-sign2-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+      name = "aws-sign2-0.5.0.tgz";
+      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~1.0.0" =
+    self.by-version."bl"."1.0.0";
+  by-version."bl"."1.0.0" = self.buildNodePackage {
+    name = "bl-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
+      name = "bl-1.0.0.tgz";
+      sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+    };
+    deps = {
+      "readable-stream-2.0.2" = self.by-version."readable-stream"."2.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.9.30" =
+    self.by-version."bluebird"."2.10.2";
+  by-version."bluebird"."2.10.2" = self.buildNodePackage {
+    name = "bluebird-2.10.2";
+    version = "2.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz";
+      name = "bluebird-2.10.2.tgz";
+      sha1 = "024a5517295308857f14f91f1106fc3b555f446b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."2.x.x" =
+    self.by-version."boom"."2.9.0";
+  by-version."boom"."2.9.0" = self.buildNodePackage {
+    name = "boom-2.9.0";
+    version = "2.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-2.9.0.tgz";
+      name = "boom-2.9.0.tgz";
+      sha1 = "a54b7fd2fee477d351bf9e371680cbea67f12715";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."^2.8.x" =
+    self.by-version."boom"."2.9.0";
+  by-spec."caseless"."~0.11.0" =
+    self.by-version."caseless"."0.11.0";
+  by-version."caseless"."0.11.0" = self.buildNodePackage {
+    name = "caseless-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";