5 files changed, 96 insertions, 5 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index bcf63dc4b..19ee2343d 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -5,9 +5,11 @@
     <stockholm/krebs>
     <stockholm/krebs/2configs>
     <stockholm/krebs/2configs/secret-passwords.nix>
+    <stockholm/krebs/2configs/hw/x220.nix>
 
     <stockholm/krebs/2configs/repo-sync.nix>
     <stockholm/krebs/2configs/shared-buildbot.nix>
+    <stockholm/krebs/2configs/stats/puyak-client.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.puyak;
@@ -47,10 +49,6 @@
     };
   };
 
-  hardware.enableAllFirmware = true;
-  networking.wireless.enable = true;
-  nixpkgs.config.allowUnfree = true;
-
   services.logind.extraConfig = ''
     HandleLidSwitch=ignore
   '';
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 32e7bd49d..0deb01f0a 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -8,7 +8,7 @@ in
     <stockholm/krebs/2configs>
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
     <stockholm/krebs/2configs/collectd-base.nix>
-    <stockholm/krebs/2configs/central-stats-client.nix>
+    <stockholm/krebs/2configs/stats/wolf-client.nix>
     <stockholm/krebs/2configs/save-diskspace.nix>
 
     <stockholm/krebs/2configs/graphite.nix>
diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix
new file mode 100644
index 000000000..c85bac0d4
--- /dev/null
+++ b/krebs/2configs/hw/x220.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+{
+  networking.wireless.enable = lib.mkDefault true;
+
+  hardware.enableRedistributableFirmware = true;
+
+  hardware.cpu.intel.updateMicrocode = true;
+
+  services.tlp.enable = true;
+
+  boot = {
+    kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ];
+    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
+    kernelParams = [ "acpi_backlight=none" ];
+  };
+
+  hardware.opengl.extraPackages = [
+    pkgs.vaapiIntel
+    pkgs.vaapiVdpau
+  ];
+
+  security.rngd.enable = true;
+
+  services.xserver = {
+    videoDriver = "intel";
+  };
+}
diff --git a/krebs/2configs/stats/puyak-client.nix b/krebs/2configs/stats/puyak-client.nix
new file mode 100644
index 000000000..6ff88e4bc
--- /dev/null
+++ b/krebs/2configs/stats/puyak-client.nix
@@ -0,0 +1,64 @@
+{pkgs, config, ...}:
+let
+  stats-server = "stats.makefu.r"; # TODO: central krebs logging server
+in{
+  services.collectd = {
+    enable = true;
+    autoLoadPlugin = true;
+    extraConfig = ''
+      Hostname ${config.krebs.build.host.name}
+      LoadPlugin load
+      LoadPlugin disk
+      LoadPlugin memory
+      LoadPlugin df
+      Interval 30.0
+
+      LoadPlugin thermal
+
+      LoadPlugin interface
+      <Plugin "interface">
+        Interface "*Link"
+        Interface "lo"
+        Interface "vboxnet*"
+        Interface "virbr*"
+        IgnoreSelected true
+      </Plugin>
+
+      LoadPlugin df
+      <Plugin "df">
+        MountPoint "/nix/store"
+        # MountPoint "/run*"
+        # MountPoint "/sys*"
+        # MountPoint "/dev"
+        # MountPoint "/dev/shm"
+        # MountPoint "/tmp"
+        FSType "tmpfs"
+        FSType "binfmt_misc"
+        FSType "debugfs"
+        FSType "mqueue"
+        FSType "hugetlbfs"
+        FSType "systemd-1"
+        FSType "cgroup"
+        FSType "securityfs"
+        FSType "ramfs"
+        FSType "proc"
+        FSType "devpts"
+        FSType "devtmpfs"
+        MountPoint "/var/lib/docker/devicemapper"
+        IgnoreSelected true
+      </Plugin>
+
+      LoadPlugin cpu
+      <Plugin cpu>
+        ReportByCpu true
+        ReportByState true
+        ValuesPercentage true
+      </Plugin>
+
+      LoadPlugin network
+      <Plugin "network">
+          Server "${stats-server}" "25826"
+      </Plugin>
+    '';
+  };
+}
diff --git a/krebs/2configs/central-stats-client.nix b/krebs/2configs/stats/wolf-client.nix
index 0412eba9a..0412eba9a 100644
--- a/krebs/2configs/central-stats-client.nix
+++ b/krebs/2configs/stats/wolf-client.nix