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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


From 1c3f7610c594e5918acd96adce2b79d7fba2765b Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Mon, 17 Aug 2015 23:21:51 +0200
Subject: urlwatch: fix ca-bundle path

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

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 39d9fec5..531e6c87 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -78,7 +78,7 @@ let
         HOME = cfg.dataDir;
         LC_ALL = "en_US.UTF-8";
         LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-        SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+        SSL_CERT_FILE = "${pkgs.cacert}/etc/ca-bundle.crt";
       };
       serviceConfig = {
         User = user.name;
@@ -100,7 +100,6 @@ let
         ExecStart = pkgs.writeScript "urlwatch" ''
           #! /bin/sh
           set -euf
-
           from=${escapeShellArg cfg.from}
           mailto=${escapeShellArg cfg.mailto}
           urlsFile=${escapeShellArg urlsFile}
-- 
cgit v1.2.3


From a97078ca589375c76721e2cdbb24197ee458fccf Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Mon, 17 Aug 2015 23:22:49 +0200
Subject: makefu/pnp: add urlwatch

---
 makefu/1systems/pnp.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 6693dc06..1147c20f 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -10,9 +10,12 @@
       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
       ../2configs/base.nix
       ../2configs/cgit-retiolum.nix
-      ../2configs/graphite-standalone.nix
+      # ../2configs/graphite-standalone.nix
       ../2configs/vm-single-partition.nix
       ../2configs/tinc-basic-retiolum.nix
+
+      ../2configs/exim-retiolum.nix
+      ../2configs/urlwatch.nix
     ];
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
@@ -27,10 +30,14 @@
 
   networking.firewall.allowedTCPPorts = [
   # nginx runs on 80
+  80
   # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
-    80
-    8080 2003
+  # 8080 2003
+
+  # smtp
+  25
   ];
-  networking.firewall.allowedUDPPorts = [ 2003 ];
+
+  # networking.firewall.allowedUDPPorts = [ 2003 ];
 
 }
-- 
cgit v1.2.3


From 3496e869000f7b4059ec5c2597b0504f6cb855ea Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Mon, 17 Aug 2015 23:24:37 +0200
Subject: makefu:add urlwatch,exim-retiolum

---
 makefu/1systems/tsp.nix           |  8 +++++---
 makefu/2configs/exim-retiolum.nix | 11 +++++++++++
 makefu/2configs/urlwatch.nix      | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 makefu/2configs/exim-retiolum.nix
 create mode 100644 makefu/2configs/urlwatch.nix

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 388ded06..638d2ca8 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -15,13 +15,15 @@
 
       ../2configs/disable_v6.nix
       ../2configs/rad1o.nix
+
+      ../2configs/exim-retiolum.nix
     ];
   # not working in vm
   krebs.build.host = config.krebs.hosts.tsp;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@tsp";
 
-  krebs.exim-retiolum.enable = true;
+
   networking.firewall.allowedTCPPorts = [
     25
   ];
@@ -31,8 +33,8 @@
       #url = https://github.com/NixOS/nixpkgs;
       # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
       url = https://github.com/makefu/nixpkgs;
-      rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
+      #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
+      rev = "f5fe787f778b872c6b2221598501c9310cb83915";
     };
   };
-
 }
diff --git a/makefu/2configs/exim-retiolum.nix b/makefu/2configs/exim-retiolum.nix
new file mode 100644
index 00000000..fc570ba9
--- /dev/null
+++ b/makefu/2configs/exim-retiolum.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  krebs.exim-retiolum.enable = true;
+  environment.systemPackages = with pkgs; [
+    msmtp
+    mutt-kz
+  ];
+
+}
diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
new file mode 100644
index 00000000..933cb93c
--- /dev/null
+++ b/makefu/2configs/urlwatch.nix
@@ -0,0 +1,17 @@
+{ config, ... }:
+
+{
+  krebs.urlwatch = {
+    enable = true;
+    mailto = config.krebs.users.makefu.mail;
+    onCalendar = "*-*-* 05:00:00";
+    urls = [
+      ## nixpkgs maintenance
+      https://api.github.com/repos/ovh/python-ovh/tags
+      https://api.github.com/repos/embray/d2to1/tags
+      http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
+
+    ];
+  };
+}
+
-- 
cgit v1.2.3


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


From f666c217906382bd63dddc83f7f822c1798c3df7 Mon Sep 17 00:00:00 2001
From: System administrator <root@nixos.lan>
Date: Sat, 22 Aug 2015 23:28:41 +0000
Subject: add pornocauster systems

---
 makefu/1systems/pornocauster.nix         | 43 ++++++++++++++++++++++++++++++++
 makefu/2configs/sda-crypto-root-home.nix | 35 ++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 makefu/1systems/pornocauster.nix
 create mode 100644 makefu/2configs/sda-crypto-root-home.nix

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
new file mode 100644
index 00000000..b8ba9289
--- /dev/null
+++ b/makefu/1systems/pornocauster.nix
@@ -0,0 +1,43 @@
+#
+#
+#
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ../2configs/base.nix
+      ../2configs/base-gui.nix
+      ../2configs/tinc-basic-retiolum.nix
+      #../2configs/sda-crypto-root.nix
+      ../2configs/sda-crypto-root-home.nix
+      # hardware specifics are in here
+      ../2configs/tp-x200.nix
+
+      #../2configs/disable_v6.nix
+      #../2configs/rad1o.nix
+
+      #../2configs/exim-retiolum.nix
+    ];
+  # not working in vm
+  krebs.build.host = config.krebs.hosts.pornocauster;
+  krebs.build.user = config.krebs.users.makefu;
+  krebs.build.target = "root@localhost";
+
+  boot.kernelModules = [ "kvm-intel" ];
+
+
+  networking.firewall.allowedTCPPorts = [
+    25
+  ];
+
+  krebs.build.deps = {
+    nixpkgs = {
+      #url = https://github.com/NixOS/nixpkgs;
+      # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
+      url = https://github.com/makefu/nixpkgs;
+      #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
+      rev = "f5fe787f778b872c6b2221598501c9310cb83915";
+    };
+  };
+}
diff --git a/makefu/2configs/sda-crypto-root-home.nix b/makefu/2configs/sda-crypto-root-home.nix
new file mode 100644
index 00000000..28d14011
--- /dev/null
+++ b/makefu/2configs/sda-crypto-root-home.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+# sda:  bootloader grub2
+# sda1: boot ext4 (label nixboot)
+# sda2: cryptoluks -> ext4
+with lib;
+{
+  boot = {
+    loader.grub.enable =true;
+    loader.grub.version =2;
+    loader.grub.device = "/dev/sda";
+
+    initrd.luks.devices = [ { name = "main"; device = "/dev/sda2"; allowDiscards=true; }];
+    initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
+    initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
+  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/main-root";
+      fsType = "ext4";
+      options="defaults,discard";
+    };
+    # TODO: just import sda-crypto-root, add this device
+    "/home" = {
+      device = "/dev/mapper/main-home";
+      fsType = "ext4";
+      options="defaults,discard";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-label/nixboot";
+      fsType = "ext4";
+      options="defaults,discard";
+    };
+  };
+}
-- 
cgit v1.2.3


From 7a1e2f83b242b6779e1590082fbe93a8ed429611 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Aug 2015 02:48:35 +0200
Subject: makefu: cleanup,refactoring after transfer

---
 makefu/1systems/pornocauster.nix         | 17 +++++++++--------
 makefu/1systems/tsp.nix                  |  3 ++-
 makefu/2configs/base-gui.nix             | 30 ++++++++++++------------------
 makefu/2configs/main-laptop.nix          | 23 +++++++++++++++++++++++
 makefu/2configs/sda-crypto-root-home.nix |  6 +++++-
 makefu/2configs/tp-x200.nix              | 27 ++-------------------------
 makefu/2configs/tp-x220.nix              | 10 ++++++++++
 makefu/2configs/tp-x2x0.nix              | 27 +++++++++++++++++++++++++++
 makefu/2configs/zsh-user.nix             | 10 ++++++++++
 9 files changed, 100 insertions(+), 53 deletions(-)
 create mode 100644 makefu/2configs/main-laptop.nix
 create mode 100644 makefu/2configs/tp-x220.nix
 create mode 100644 makefu/2configs/tp-x2x0.nix
 create mode 100644 makefu/2configs/zsh-user.nix

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index b8ba9289..b6b7a59b 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -7,22 +7,24 @@
   imports =
     [ # Include the results of the hardware scan.
       ../2configs/base.nix
-      ../2configs/base-gui.nix
+      ../2configs/main-laptop.nix #< base-gui
+
       ../2configs/tinc-basic-retiolum.nix
       #../2configs/sda-crypto-root.nix
       ../2configs/sda-crypto-root-home.nix
-      # hardware specifics are in here
-      ../2configs/tp-x200.nix
 
+      ../2configs/zsh-user.nix
+      ../2configs/exim-retiolum.nix
       #../2configs/disable_v6.nix
-      #../2configs/rad1o.nix
 
-      #../2configs/exim-retiolum.nix
+      # hardware specifics are in here
+      ../2configs/tp-x220.nix
     ];
-  # not working in vm
+
   krebs.build.host = config.krebs.hosts.pornocauster;
   krebs.build.user = config.krebs.users.makefu;
-  krebs.build.target = "root@localhost";
+  krebs.build.target = "root@pornocauster";
+
 
   boot.kernelModules = [ "kvm-intel" ];
 
@@ -36,7 +38,6 @@
       #url = https://github.com/NixOS/nixpkgs;
       # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
       url = https://github.com/makefu/nixpkgs;
-      #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
       rev = "f5fe787f778b872c6b2221598501c9310cb83915";
     };
   };
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 638d2ca8..887778c8 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -11,11 +11,12 @@
       ../2configs/tinc-basic-retiolum.nix
       ../2configs/sda-crypto-root.nix
       # hardware specifics are in here
-      ../2configs/tp-x200.nix
+      ../2configs/tp-x200.nix #< imports tp-x2x0.nix
 
       ../2configs/disable_v6.nix
       ../2configs/rad1o.nix
 
+      ../2configs/zsh-user.nix
       ../2configs/exim-retiolum.nix
     ];
   # not working in vm
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 55fcd6ba..6896a66d 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -1,11 +1,15 @@
 { config, lib, pkgs, ... }:
 ##
-# of course this name is a lie - it prepares a GUI environment close to my
-# current configuration.
+# of course this name is a lie
+# - it prepares a GUI environment close to my
+# current configuration,specifically:
 #
-# autologin with mainUser into awesome
-##
+# * autologin with mainUser into awesome
+# * audio
+# * terminus font
 #
+# if this is not enough, check out main-laptop.nix
+
 with lib;
 let
   mainUser = config.krebs.build.user.name;
@@ -28,14 +32,6 @@ in
     displayManager.auto.user = mainUser;
     desktopManager.xterm.enable = false;
   };
-  services.redshift = {
-    enable = true;
-    latitude = "48.7";
-    longitude = "9.1";
-  };
-
-## FONTS
-# TODO: somewhere else?
 
   i18n.consoleFont = "Lat2-Terminus16";
 
@@ -49,14 +45,12 @@ in
   environment.systemPackages = with pkgs;[
     xlockmore
     rxvt_unicode-with-plugins
-    vlc
     firefox
-    chromium
   ];
-  # TODO: use mainUser
-  users.extraUsers.makefu.extraGroups = [ "audio" ];
+  users.extraUsers.${mainUser}.extraGroups = [ "audio" ];
+
   hardware.pulseaudio = {
-    enable = true;
-  #  systemWide = true;
+     enable = true;
+   #  systemWide = true;
   };
 }
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
new file mode 100644
index 00000000..8d2c8213
--- /dev/null
+++ b/makefu/2configs/main-laptop.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+# stuff for the main laptop
+# this is pretty much nice-to-have and does
+# not fit into base-gui
+
+with lib;
+{
+  imports = [ ./base-gui.nix ];
+  environment.systemPackages = with pkgs;[
+    vlc
+    firefox
+    chromium
+    keepassx
+  ];
+
+  services.redshift = {
+    enable = true;
+    latitude = "48.7";
+    longitude = "9.1";
+  };
+
+}
diff --git a/makefu/2configs/sda-crypto-root-home.nix b/makefu/2configs/sda-crypto-root-home.nix
index 28d14011..3821c750 100644
--- a/makefu/2configs/sda-crypto-root-home.nix
+++ b/makefu/2configs/sda-crypto-root-home.nix
@@ -1,8 +1,12 @@
 { config, lib, pkgs, ... }:
 
+# ssd #
 # sda:  bootloader grub2
 # sda1: boot ext4 (label nixboot)
-# sda2: cryptoluks -> ext4
+# sda2: cryptoluks -> lvm:
+#       /     (main-root)
+#       /home (main-home)
+
 with lib;
 {
   boot = {
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index 2bbc75c2..aed6d644 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -2,36 +2,13 @@
 
 with lib;
 {
-  #services.xserver = {
-  #  videoDriver = "intel";
-  #};
+
+  imports = [ ./tp-x2x0.nix ];
 
   boot = {
     kernelModules = [ "tp_smapi" "msr" ];
     extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
 
   };
-
-  #networking.wireless.enable = true;
-
-  hardware.enableAllFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-
-  zramSwap.enable = true;
-  zramSwap.numDevices = 2;
-
-  hardware.trackpoint.enable = true;
-  hardware.trackpoint.sensitivity = 255;
-  hardware.trackpoint.speed = 255;
-  services.xserver.displayManager.sessionCommands = ''
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
-  '';
-
   services.thinkfan.enable = true;
-  services.tlp.enable = true;
-  services.tlp.extraConfig = ''
-  START_CHARGE_THRESH_BAT0=80
-  '';
 }
diff --git a/makefu/2configs/tp-x220.nix b/makefu/2configs/tp-x220.nix
new file mode 100644
index 00000000..64eb78b1
--- /dev/null
+++ b/makefu/2configs/tp-x220.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+
+  imports = [ ./tp-x2x0.nix ];
+
+  boot.kernelModules = [ "kvm-intel" ];
+
+}
diff --git a/makefu/2configs/tp-x2x0.nix b/makefu/2configs/tp-x2x0.nix
new file mode 100644
index 00000000..e6556301
--- /dev/null
+++ b/makefu/2configs/tp-x2x0.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  # TODO: pot this somewhere else
+  networking.wireless.enable = true;
+
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+
+  zramSwap.enable = true;
+  zramSwap.numDevices = 2;
+
+  hardware.trackpoint.enable = true;
+  hardware.trackpoint.sensitivity = 220;
+  hardware.trackpoint.speed = 220;
+  services.xserver.displayManager.sessionCommands = ''
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+  '';
+
+  services.tlp.enable = true;
+  services.tlp.extraConfig = ''
+  START_CHARGE_THRESH_BAT0=80
+  '';
+}
diff --git a/makefu/2configs/zsh-user.nix b/makefu/2configs/zsh-user.nix
new file mode 100644
index 00000000..3089b706
--- /dev/null
+++ b/makefu/2configs/zsh-user.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+##
+with lib;
+let
+  mainUser = config.krebs.build.user.name;
+in
+{
+  programs.zsh.enable = true;
+  users.extraUsers.${mainUser}.shell = "/run/current-system/sw/bin/zsh";
+}
-- 
cgit v1.2.3


From 6c206726e33e51cfac947ada4ad5ec7e5e107830 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Aug 2015 14:15:41 +0200
Subject: makefu: add button-3 scrolling to x220 config

---
 makefu/1systems/pornocauster.nix | 4 ----
 makefu/2configs/tp-x220.nix      | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index b6b7a59b..21859453 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -25,10 +25,6 @@
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@pornocauster";
 
-
-  boot.kernelModules = [ "kvm-intel" ];
-
-
   networking.firewall.allowedTCPPorts = [
     25
   ];
diff --git a/makefu/2configs/tp-x220.nix b/makefu/2configs/tp-x220.nix
index 64eb78b1..d079d5b3 100644
--- a/makefu/2configs/tp-x220.nix
+++ b/makefu/2configs/tp-x220.nix
@@ -6,5 +6,11 @@ with lib;
   imports = [ ./tp-x2x0.nix ];
 
   boot.kernelModules = [ "kvm-intel" ];
+  services.xserver.displayManager.sessionCommands =''
+  xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
+  xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
+  xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 8 200
+  xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
+  '';
 
 }
-- 
cgit v1.2.3


From a7f605bdf00771dd36d5f40acb52dcdf68063575 Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Sun, 23 Aug 2015 14:35:13 +0200
Subject: makefu: add wwan with wvdial

---
 makefu/2configs/wwan.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 makefu/2configs/wwan.nix

diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix
new file mode 100644
index 00000000..fdf3e8df
--- /dev/null
+++ b/makefu/2configs/wwan.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+let
+  mainUser = config.krebs.build.user;
+in {
+  environment.systemPackages = with pkgs;[
+    wvdial
+  ];
+
+  users.extraUsers.${mainUser.name}.extraGroups = [ "dialout" ];
+}
-- 
cgit v1.2.3


From 46eb6b4d40880542d30788266ef190801b781a31 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Aug 2015 14:49:54 +0200
Subject: makefu/cgit: change stockholm description

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

diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix
index d352f579..8d943956 100644
--- a/makefu/2configs/cgit-retiolum.nix
+++ b/makefu/2configs/cgit-retiolum.nix
@@ -8,7 +8,7 @@ let
 
   krebs-repos = mapAttrs make-krebs-repo {
     stockholm = {
-      desc = "take all the computers hostage, they'll love you!";
+      desc = "Make all the systems into 1systems!";
     };
   };
 
-- 
cgit v1.2.3


From dce1ad91445297ecc122f968a12339438eabaa63 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Aug 2015 15:03:11 +0200
Subject: makefu:add wwan configuration for netzclub

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

diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix
index fdf3e8df..1492213b 100644
--- a/makefu/2configs/wwan.nix
+++ b/makefu/2configs/wwan.nix
@@ -1,4 +1,5 @@
 { config, lib, pkgs, ... }:
+
 let
   mainUser = config.krebs.build.user;
 in {
@@ -6,5 +7,21 @@ in {
     wvdial
   ];
 
+  # configure for NETZCLUB
+  environment.wvdial.dialerDefaults = ''
+    Phone = *99***1#
+    Dial Command = ATDT
+    Modem = /dev/ttyACM0
+    Baud = 460800
+    Init1 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
+    Init2 = ATZ
+    Init3 = ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0
+    ISDN = 0
+    Modem Type = Analog Modem
+    Username = netzclub
+    Password = netzclub
+    Stupid Mode = 1
+    Idle Seconds = 0'';
+
   users.extraUsers.${mainUser.name}.extraGroups = [ "dialout" ];
 }
-- 
cgit v1.2.3


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

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

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


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

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

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


From e1e8b63fc3fee5db003feb2cde926e85076d34a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Aug 2015 11:04:17 +0200
Subject: makefu/x200: fix issue broken vlc, wheel on middle click

---
 makefu/2configs/tp-x200.nix | 7 +++++++
 makefu/2configs/tp-x220.nix | 3 +++
 makefu/2configs/tp-x2x0.nix | 7 +------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index aed6d644..ed46875d 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -11,4 +11,11 @@ with lib;
 
   };
   services.thinkfan.enable = true;
+
+  # only works on tp-x200 , not x220
+  services.xserver.displayManager.sessionCommands = ''
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+  '';
 }
diff --git a/makefu/2configs/tp-x220.nix b/makefu/2configs/tp-x220.nix
index d079d5b3..1aacb07c 100644
--- a/makefu/2configs/tp-x220.nix
+++ b/makefu/2configs/tp-x220.nix
@@ -6,6 +6,9 @@ with lib;
   imports = [ ./tp-x2x0.nix ];
 
   boot.kernelModules = [ "kvm-intel" ];
+
+  services.xserver.vaapiDrivers = [pkgs.vaapiIntel pkgs.vaapiVdpau ];
+
   services.xserver.displayManager.sessionCommands =''
   xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
   xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
diff --git a/makefu/2configs/tp-x2x0.nix b/makefu/2configs/tp-x2x0.nix
index e6556301..b79d94b4 100644
--- a/makefu/2configs/tp-x2x0.nix
+++ b/makefu/2configs/tp-x2x0.nix
@@ -2,7 +2,7 @@
 
 with lib;
 {
-  # TODO: pot this somewhere else
+  # TODO: put this somewhere else
   networking.wireless.enable = true;
 
   hardware.enableAllFirmware = true;
@@ -14,11 +14,6 @@ with lib;
   hardware.trackpoint.enable = true;
   hardware.trackpoint.sensitivity = 220;
   hardware.trackpoint.speed = 220;
-  services.xserver.displayManager.sessionCommands = ''
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
-  '';
 
   services.tlp.enable = true;
   services.tlp.extraConfig = ''
-- 
cgit v1.2.3


From a0f6ac66e1420d9e3efa0443e05aee13b313b6d3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Aug 2015 11:06:10 +0200
Subject: makefu: add virtualization

---
 makefu/1systems/pornocauster.nix   | 8 +++++++-
 makefu/2configs/virtualization.nix | 8 ++++++++
 makefu/2configs/wwan.nix           | 2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/virtualization.nix

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 21859453..40aa5bb1 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -9,13 +9,19 @@
       ../2configs/base.nix
       ../2configs/main-laptop.nix #< base-gui
 
+      # Krebs
       ../2configs/tinc-basic-retiolum.nix
+      #../2configs/disable_v6.nix
+
       #../2configs/sda-crypto-root.nix
       ../2configs/sda-crypto-root-home.nix
 
       ../2configs/zsh-user.nix
+
+      # applications
       ../2configs/exim-retiolum.nix
-      #../2configs/disable_v6.nix
+      ../2configs/virtualization.nix
+      ../2configs/wwan.nix
 
       # hardware specifics are in here
       ../2configs/tp-x220.nix
diff --git a/makefu/2configs/virtualization.nix b/makefu/2configs/virtualization.nix
new file mode 100644
index 00000000..b3f8c828
--- /dev/null
+++ b/makefu/2configs/virtualization.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+let
+  mainUser = config.krebs.build.user;
+in {
+  virtualisation.libvirtd.enable = true;
+  users.extraUsers.${mainUser.name}.extraGroups = [ "libvirtd" ];
+}
diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix
index 1492213b..dd1c6309 100644
--- a/makefu/2configs/wwan.nix
+++ b/makefu/2configs/wwan.nix
@@ -1,5 +1,7 @@
 { config, lib, pkgs, ... }:
 
+#usage: $ wvdial
+
 let
   mainUser = config.krebs.build.user;
 in {
-- 
cgit v1.2.3


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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