From 53a8f2df302f8ae0760bfb63473caaaa9134fbfd Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 19 Jan 2016 20:04:29 +0100
Subject: [PATCH 1/5] ma 2 git/cgit: add init-stockholm repo

---
 2configs/git/cgit-retiolum.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/2configs/git/cgit-retiolum.nix b/2configs/git/cgit-retiolum.nix
index 35bb169..7d85eb8 100644
--- a/2configs/git/cgit-retiolum.nix
+++ b/2configs/git/cgit-retiolum.nix
@@ -16,6 +16,9 @@ let
       desc = "Tinc Advanced Graph Generation";
     };
     cac = { };
+    init-stockholm = {
+      desc = "Init stuff for stockholm";
+    };
   };
 
   priv-repos = mapAttrs make-priv-repo {

From 8d8bed99039710f0aa4c496c1269d4344ff03bc0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 19 Jan 2016 20:37:46 +0100
Subject: [PATCH 2/5] ma 2 tinc-basic-retiolum: remove obsolete hosts path -
 corresponds with defaults

---
 2configs/tinc-basic-retiolum.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/2configs/tinc-basic-retiolum.nix b/2configs/tinc-basic-retiolum.nix
index 2abf4f1..f49c596 100644
--- a/2configs/tinc-basic-retiolum.nix
+++ b/2configs/tinc-basic-retiolum.nix
@@ -4,7 +4,6 @@ with lib;
 {
   krebs.retiolum = {
     enable = true;
-    hosts = ../../krebs/Zhosts;
     connectTo = [
       "gum"
       "pigstarter"

From a7578fbdafb65f5503c66d26f482b2857e5605ca Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Wed, 13 Jan 2016 12:20:01 +0100
Subject: [PATCH 3/5] ma 5 awesomecfg/full: remove volume field

---
 5pkgs/awesomecfg/full.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/5pkgs/awesomecfg/full.cfg b/5pkgs/awesomecfg/full.cfg
index 15711a5..c1b58aa 100644
--- a/5pkgs/awesomecfg/full.cfg
+++ b/5pkgs/awesomecfg/full.cfg
@@ -38,8 +38,6 @@ do
     end)
 end
 -- }}}
-volwidget = wibox.widget.textbox()
-vicious.register(volwidget, vicious.widgets.volume, " $1% ", 2, "Master")
 
 -- {{{ Mails widget type
 local function worker(format,warg)
@@ -258,7 +256,6 @@ for s = 1, screen.count() do
     local right_layout = wibox.layout.fixed.horizontal()
     right_layout:add(mailwidget)
     if s == 1 then right_layout:add(wibox.widget.systray()) end
-    right_layout:add(volwidget)
     right_layout:add(cpuwidget)
     right_layout:add(batwidget)
     right_layout:add(mytextclock)

From 703da02cab4e368bc8cd3696dc05aa5301f75605 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Mon, 18 Jan 2016 12:54:03 +0100
Subject: [PATCH 4/5] ma 1 vbob: remove unstable

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

diff --git a/1systems/vbob.nix b/1systems/vbob.nix
index b8c02cb..d953629 100644
--- a/1systems/vbob.nix
+++ b/1systems/vbob.nix
@@ -2,9 +2,7 @@
 #
 #
 { lib, config, pkgs, ... }:
-let
-    pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
-in {
+{
   krebs.build.host = config.krebs.hosts.vbob;
   krebs.build.target = "root@10.10.10.220";
   imports =
@@ -15,14 +13,13 @@ in {
       # environment
 
     ];
+  nixpkgs.config.allowUnfree = true;
   nixpkgs.config.packageOverrides = pkgs: {
     tinc = pkgs.tinc_pre;
-    buildbot = pkgs-unst.buildbot;
-    buildbot-slave = pkgs-unst.buildbot-slave;
   };
 
   makefu.buildbot.master = {
-    enable = true;
+    enable = false;
     irc = {
       enable = true;
       server = "cd.retiolum";
@@ -30,8 +27,9 @@ in {
       allowForce = true;
     };
   };
+  # services.logstash.enable = true;
   makefu.buildbot.slave = {
-    enable = true;
+    enable = false;
     masterhost = "localhost";
     username = "testslave";
     password = "krebspass";
@@ -41,8 +39,8 @@ in {
 
   krebs.build.source.git.nixpkgs = {
     #url = https://github.com/nixos/nixpkgs;
-    # HTTP Everywhere
-    rev = "a3974e";
+    # HTTP Everywhere + libredir
+    rev = "8239ac6";
   };
   fileSystems."/nix" = {
     device ="/dev/disk/by-label/nixstore";
@@ -56,9 +54,12 @@ in {
     };
   };
   environment.systemPackages = with pkgs;[
+    fortclientsslvpn
     buildbot
     buildbot-slave
     get
+    genid
+    logstash
   ];
 
   networking.firewall.allowedTCPPorts = [

From 2407b72fae9e6afe9682a8e16cfab217ae12e57e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 19 Jan 2016 20:26:38 +0100
Subject: [PATCH 5/5] makefu: init wbob

---
 1systems/wbob.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 1systems/wbob.nix

diff --git a/1systems/wbob.nix b/1systems/wbob.nix
new file mode 100644
index 0000000..d6916f0
--- /dev/null
+++ b/1systems/wbob.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ../2configs/main-laptop.nix
+    ];
+    krebs = {
+        enable = true;
+        retiolum.enable = true;
+        build.host = config.krebs.hosts.wbob;
+    };
+    boot.loader.grub.device = "/dev/sda";
+    boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" ];
+    boot.kernelModules = [ "kvm-intel" ];
+    fileSystems."/" = {
+        device = "/dev/sda1";
+        fsType = "ext4";
+    };
+}