Merge remote-tracking branch 'origin/master'

15 files changed, 109 insertions, 199 deletions

diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index b9a1c87d..469d6de9 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -25,7 +25,7 @@ in {
 
   fileSystems."/".device = "/dev/disk/by-uuid/${rootUUID}";
   fileSystems."/".fsType = "btrfs";
-  fileSystems."/".options = concatStringsSep "," [
+  fileSystems."/".options = [
     "ssd"
     "space_cache"
     "compress-force=zlib"
@@ -34,7 +34,7 @@ in {
 
   fileSystems."/tmp".device = "none";
   fileSystems."/tmp".fsType = "tmpfs";
-  fileSystems."/tmp".options = "nosuid,nodev,relatime";
+  fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
   swapDevices = singleton {
     device = "/dev/disk/by-uuid/${swapUUID}";
diff --git a/machines/aszlig/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix
index a34f9871..614a7888 100644
--- a/machines/aszlig/dnyarri-kconf.nix
+++ b/machines/aszlig/dnyarri-kconf.nix
@@ -8,8 +8,11 @@
   "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig";
   "CONFIG_LOCKDEP_SUPPORT" = "y";
   "CONFIG_STACKTRACE_SUPPORT" = "y";
-  "CONFIG_HAVE_LATENCYTOP_SUPPORT" = "y";
   "CONFIG_MMU" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS_MIN" = "28";
+  "CONFIG_ARCH_MMAP_RND_BITS_MAX" = "32";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN" = "8";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX" = "16";
   "CONFIG_NEED_DMA_MAP_STATE" = "y";
   "CONFIG_NEED_SG_DMA_LENGTH" = "y";
   "CONFIG_GENERIC_ISA_DMA" = "y";
@@ -101,15 +104,15 @@
   "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y";
   "CONFIG_ARCH_SUPPORTS_INT128" = "y";
   "CONFIG_CGROUPS" = "y";
-  "CONFIG_CGROUP_FREEZER" = "y";
-  "CONFIG_CGROUP_PIDS" = "y";
-  "CONFIG_CGROUP_DEVICE" = "y";
-  "CONFIG_CPUSETS" = "y";
-  "CONFIG_CGROUP_CPUACCT" = "y";
+  "CONFIG_BLK_CGROUP" = "y";
   "CONFIG_CGROUP_SCHED" = "y";
   "CONFIG_FAIR_GROUP_SCHED" = "y";
   "CONFIG_CFS_BANDWIDTH" = "y";
-  "CONFIG_BLK_CGROUP" = "y";
+  "CONFIG_CGROUP_PIDS" = "y";
+  "CONFIG_CGROUP_FREEZER" = "y";
+  "CONFIG_CPUSETS" = "y";
+  "CONFIG_CGROUP_DEVICE" = "y";
+  "CONFIG_CGROUP_CPUACCT" = "y";
   "CONFIG_NAMESPACES" = "y";
   "CONFIG_UTS_NS" = "y";
   "CONFIG_IPC_NS" = "y";
@@ -169,7 +172,6 @@
   "CONFIG_HAVE_OPTPROBES" = "y";
   "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
-  "CONFIG_HAVE_DMA_ATTRS" = "y";
   "CONFIG_HAVE_DMA_CONTIGUOUS" = "y";
   "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y";
   "CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT" = "y";
@@ -202,6 +204,10 @@
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
   "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y";
+  "CONFIG_HAVE_ARCH_MMAP_RND_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS" = "28";
+  "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8";
   "CONFIG_HAVE_COPY_THREAD_TLS" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
@@ -215,7 +221,6 @@
   "CONFIG_MODULE_FORCE_UNLOAD" = "y";
   "CONFIG_MODVERSIONS" = "y";
   "CONFIG_MODULES_TREE_LOOKUP" = "y";
-  "CONFIG_STOP_MACHINE" = "y";
   "CONFIG_BLOCK" = "y";
   "CONFIG_BLK_DEV_BSG" = "y";
   "CONFIG_BLK_DEV_INTEGRITY" = "y";
@@ -246,6 +251,7 @@
   "CONFIG_ZONE_DMA" = "y";
   "CONFIG_SMP" = "y";
   "CONFIG_X86_FEATURE_NAMES" = "y";
+  "CONFIG_X86_FAST_FEATURE_TESTS" = "y";
   "CONFIG_IOSF_MBI" = "m";
   "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y";
   "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y";
@@ -412,6 +418,7 @@
   "CONFIG_PMC_ATOM" = "y";
   "CONFIG_NET" = "y";
   "CONFIG_NET_INGRESS" = "y";
+  "CONFIG_NET_EGRESS" = "y";
   "CONFIG_PACKET" = "y";
   "CONFIG_PACKET_DIAG" = "m";
   "CONFIG_UNIX" = "y";
@@ -504,6 +511,9 @@
   "CONFIG_NFT_REJECT" = "m";
   "CONFIG_NFT_REJECT_INET" = "m";
   "CONFIG_NFT_COMPAT" = "m";
+  "CONFIG_NF_DUP_NETDEV" = "m";
+  "CONFIG_NFT_DUP_NETDEV" = "m";
+  "CONFIG_NFT_FWD_NETDEV" = "m";
   "CONFIG_NETFILTER_XTABLES" = "m";
   "CONFIG_NETFILTER_XT_MARK" = "m";
   "CONFIG_NETFILTER_XT_CONNMARK" = "m";
@@ -752,6 +762,7 @@
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
+  "CONFIG_SOCK_CGROUP_DATA" = "y";
   "CONFIG_CGROUP_NET_CLASSID" = "y";
   "CONFIG_NET_RX_BUSY_POLL" = "y";
   "CONFIG_BQL" = "y";
@@ -805,6 +816,7 @@
   "CONFIG_DM_UEVENT" = "y";
   "CONFIG_DM_FLAKEY" = "m";
   "CONFIG_DM_VERITY" = "m";
+  "CONFIG_DM_VERITY_FEC" = "y";
   "CONFIG_DM_LOG_WRITES" = "m";
   "CONFIG_NETDEVICES" = "y";
   "CONFIG_NET_CORE" = "y";
@@ -849,6 +861,10 @@
   "CONFIG_INPUT_KEYBOARD" = "y";
   "CONFIG_KEYBOARD_ATKBD" = "y";
   "CONFIG_INPUT_MOUSE" = "y";
+  "CONFIG_INPUT_JOYSTICK" = "y";
+  "CONFIG_JOYSTICK_XPAD" = "y";
+  "CONFIG_JOYSTICK_XPAD_FF" = "y";
+  "CONFIG_JOYSTICK_XPAD_LEDS" = "y";
   "CONFIG_INPUT_MISC" = "y";
   "CONFIG_INPUT_UINPUT" = "m";
   "CONFIG_SERIO" = "y";
@@ -900,6 +916,7 @@
   "CONFIG_INTEL_PCH_THERMAL" = "m";
   "CONFIG_SSB_POSSIBLE" = "y";
   "CONFIG_BCMA_POSSIBLE" = "y";
+  "CONFIG_MFD_CORE" = "m";
   "CONFIG_MEDIA_SUPPORT" = "y";
   "CONFIG_MEDIA_CAMERA_SUPPORT" = "y";
   "CONFIG_VIDEO_DEV" = "y";
@@ -975,6 +992,7 @@
   "CONFIG_DRM_BRIDGE" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CMDLINE" = "y";
+  "CONFIG_FB_NOTIFY" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
   "CONFIG_FB_CFB_IMAGEBLIT" = "y";
@@ -1040,18 +1058,7 @@
   "CONFIG_HID_BATTERY_STRENGTH" = "y";
   "CONFIG_UHID" = "m";
   "CONFIG_HID_GENERIC" = "y";
-  "CONFIG_HID_A4TECH" = "y";
-  "CONFIG_HID_APPLE" = "y";
-  "CONFIG_HID_BELKIN" = "y";
-  "CONFIG_HID_CHERRY" = "y";
-  "CONFIG_HID_CHICONY" = "y";
-  "CONFIG_HID_CYPRESS" = "y";
-  "CONFIG_HID_EZKEY" = "y";
-  "CONFIG_HID_GEMBIRD" = "m";
-  "CONFIG_HID_KENSINGTON" = "y";
-  "CONFIG_HID_LOGITECH" = "y";
   "CONFIG_HID_MICROSOFT" = "y";
-  "CONFIG_HID_MONTEREY" = "y";
   "CONFIG_HID_PANTHERLORD" = "y";
   "CONFIG_PANTHERLORD_FF" = "y";
   "CONFIG_HID_SONY" = "m";
@@ -1059,7 +1066,10 @@
   "CONFIG_HID_GREENASIA" = "y";
   "CONFIG_GREENASIA_FF" = "y";
   "CONFIG_HID_WACOM" = "m";
+  "CONFIG_HID_SENSOR_HUB" = "m";
+  "CONFIG_HID_SENSOR_CUSTOM_SENSOR" = "m";
   "CONFIG_USB_HID" = "y";
+  "CONFIG_HID_PID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
   "CONFIG_I2C_HID" = "m";
   "CONFIG_USB_OHCI_LITTLE_ENDIAN" = "y";
@@ -1133,6 +1143,7 @@
   "CONFIG_USB_SERIAL_METRO" = "m";
   "CONFIG_USB_SERIAL_MOS7720" = "m";
   "CONFIG_USB_SERIAL_MOS7840" = "m";
+  "CONFIG_USB_SERIAL_MXUPORT11" = "m";
   "CONFIG_USB_SERIAL_MXUPORT" = "m";
   "CONFIG_USB_SERIAL_NAVMAN" = "m";
   "CONFIG_USB_SERIAL_PL2303" = "m";
@@ -1157,8 +1168,9 @@
   "CONFIG_USB_SERIAL_DEBUG" = "m";
   "CONFIG_USB_EZUSB_FX2" = "m";
   "CONFIG_NEW_LEDS" = "y";
-  "CONFIG_LEDS_CLASS" = "m";
-  "CONFIG_LEDS_CLASS_FLASH" = "m";
+  "CONFIG_LEDS_CLASS" = "y";
+  "CONFIG_LEDS_CLASS_FLASH" = "y";
+  "CONFIG_LEDS_TRIGGERS" = "y";
   "CONFIG_EDAC_ATOMIC_SCRUB" = "y";
   "CONFIG_EDAC_SUPPORT" = "y";
   "CONFIG_RTC_LIB" = "y";
@@ -1175,7 +1187,7 @@
   "CONFIG_CLKEVT_I8253" = "y";
   "CONFIG_I8253_LOCK" = "y";
   "CONFIG_CLKBLD_I8253" = "y";
-  "CONFIG_EXTCON" = "m";
+  "CONFIG_ARM_GIC_MAX_NR" = "1";
   "CONFIG_RAS" = "y";
   "CONFIG_FIRMWARE_MEMMAP" = "y";
   "CONFIG_DMIID" = "y";
@@ -1331,7 +1343,10 @@
   "CONFIG_TEST_HEXDUMP" = "m";
   "CONFIG_MEMTEST" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
+  "CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL" = "y";
+  "CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
+  "CONFIG_IO_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
   "CONFIG_EARLY_PRINTK" = "y";
   "CONFIG_DOUBLEFAULT" = "y";
@@ -1566,6 +1581,7 @@
   "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y";
   "CONFIG_CLZ_TAB" = "y";
   "CONFIG_CORDIC" = "y";
+  "CONFIG_IRQ_POLL" = "y";
   "CONFIG_MPILIB" = "y";
   "CONFIG_OID_REGISTRY" = "y";
   "CONFIG_FONT_SUPPORT" = "y";
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 5192e955..a041486e 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -109,7 +109,7 @@ with lib;
   # TODO: Try to avoid this, but as there is only a single user using audio on
   # this machine, it's okay for now. But remember that this will break heavily,
   # should there be another user accessing the audio devices.
-  users.extraUsers.aszlig.extraGroups = [ "audio" "vboxusers" ];
+  users.users.aszlig.extraGroups = [ "audio" "vboxusers" ];
 
   services.synergy.client.enable = true;
   services.synergy.client.serverAddress = "mmrnmhrm";
diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix
index b90b05d2..41b380b9 100644
--- a/machines/aszlig/kzerza.nix
+++ b/machines/aszlig/kzerza.nix
@@ -24,7 +24,7 @@ in {
 
   fileSystems."/".device = "/dev/disk/by-uuid/${rootUUID}";
   fileSystems."/".fsType = "btrfs";
-  fileSystems."/".options = concatStringsSep "," [
+  fileSystems."/".options = [
     "ssd"
     "space_cache"
     "compress-force=zlib"
@@ -38,10 +38,10 @@ in {
 
   fileSystems."/tmp".device = "none";
   fileSystems."/tmp".fsType = "tmpfs";
-  fileSystems."/tmp".options = "nosuid,nodev,relatime";
+  fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
-  users.extraGroups.grandpa.gid = 666;
-  users.extraUsers.grandpa = {
+  users.groups.grandpa.gid = 666;
+  users.users.grandpa = {
     uid = 666;
     description = "GrandPA User";
     group = "grandpa";
diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix
deleted file mode 100644
index 75730ff4..00000000
--- a/machines/aszlig/managed/haenk.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  boot.initrd.availableKernelModules = [
-    "pata_sis" "ohci_pci" "ehci_pci" "firewire_ohci" "sd_mod" "sr_mod"
-  ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.loader.grub = {
-    enable = true;
-    version = 2;
-    device = "/dev/disk/by-id/ata-FUJITSU_MHV2080AH_NT61T782VR71";
-  };
-
-  environment.systemPackages = with pkgs; [
-    cdparanoia chromium figlet gajim gimp htop inkscape kde5.oxygen-icons5
-    libreoffice mosh mpv pciutils skype vlc vuizvui.greybird-xfce-theme
-    vuizvui.tomahawk wget youtubeDL
-  ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/df1cab2d-cbca-4fc5-af6a-c0580c4db1b7";
-    fsType = "btrfs";
-  };
-
-  swapDevices = lib.singleton {
-    device = "/dev/disk/by-uuid/b5ea0ae8-20c6-43dd-ad97-6d8c783dac02";
-  };
-
-  hardware = {
-    cpu.amd.updateMicrocode = true;
-
-    firmware = lib.singleton (pkgs.runCommand "ipw2x00-firmware" {} ''
-      mkdir -p "$out/lib/firmware"
-      cp "${pkgs.fetchgit rec {
-        name = "ipw2x00-20151227";
-        url = "git://anonscm.debian.org/kernel/firmware-nonfree.git";
-        rev = "e4147b94a856dfe7d4dac11b5da7d9e96b3c2e95";
-        sha256 = "18kymqzhlppj520n6vkq5666qgryz3prym1pxn3sqv34yvav7agi";
-      }}"/debian/config/ipw2x00/*.fw "$out/lib/firmware/"
-    '');
-
-    pulseaudio.enable = true;
-  };
-
-  i18n.consoleKeyMap = "de";
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  networking.hostName = "haenk";
-  networking.firewall.enable = false;
-  networking.wireless.enable = true;
-  networking.useNetworkd = true;
-  networking.enableIntel2200BGFirmware = true;
-
-  nix.maxJobs = 1;
-  nix.useChroot = true;
-  nix.extraOptions = ''
-    auto-optimise-store = true
-  '';
-
-  nixpkgs.config = {
-    allowUnfree = true;
-    pulseaudio = true;
-    chromium.enablePepperFlash = true;
-
-    packageOverrides = opkgs: {
-      # This is because the driver for the NV44M GPU doesn't like LLVM 3.7
-      mesa_noglu = opkgs.mesa_noglu.override {
-        llvmPackages = opkgs.llvmPackages_36;
-      };
-    };
-  };
-
-  services.openssh.enable = true;
-  services.tlp.enable = true;
-  services.ntp.extraFlags = [ "-G" ];
-
-  services.xserver.enable = true;
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "eurosign:e";
-  services.xserver.displayManager.auto.enable = true;
-  services.xserver.displayManager.auto.user = "bla";
-  services.xserver.desktopManager.xfce.enable = true;
-  services.xserver.synaptics.enable = true;
-  services.xserver.wacom.enable = true;
-
-  time.timeZone = "Europe/Berlin";
-
-  users.extraUsers.bla = {
-    isNormalUser = true;
-    uid = 1000;
-    extraGroups = [ "video" "wheel" ];
-  };
-
-  vuizvui.user.aszlig.programs.vim.enable = true;
-}
diff --git a/machines/aszlig/managed/notsure.nix b/machines/aszlig/managed/notsure.nix
index 1b807e35..3d222970 100644
--- a/machines/aszlig/managed/notsure.nix
+++ b/machines/aszlig/managed/notsure.nix
@@ -15,7 +15,7 @@ in {
   fileSystems."/" = {
     label = "root";
     fsType = "btrfs";
-    options = "rw,space_cache,relatime";
+    options = [ "space_cache" "relatime" ];
   };
 
   hardware = {
@@ -86,4 +86,5 @@ in {
   time.timeZone = "Europe/Berlin";
 
   vuizvui.user.aszlig.programs.vim.enable = true;
+  vuizvui.enableGlobalNixpkgsConfig = true;
 }
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index fead2ef3..6e02e54f 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -17,7 +17,7 @@
 
   fileSystems."/".label = "tyree-root";
   fileSystems."/".fsType = "btrfs";
-  fileSystems."/".options = lib.concatStringsSep "," [
+  fileSystems."/".options = [
     "compress=lzo"
     "discard"
     "noatime"
@@ -37,7 +37,9 @@
 
   networking.hostName = "tyree";
   networking.firewall.enable = false;
-  networking.wireless.enable = true;
+  networking.wireless.enable = false;
+  networking.enableRTL8192cFirmware = true;
+  networking.networkmanager.enable = true;
   networking.useNetworkd = true;
 
   nix.maxJobs = 4;
@@ -63,12 +65,11 @@
   services.xserver.displayManager.auto.enable = true;
   services.xserver.displayManager.auto.user = "bla";
   services.xserver.desktopManager.kde5.enable = true;
-  services.xserver.synaptics.enable = true;
   services.xserver.wacom.enable = true;
 
   time.timeZone = "Europe/Berlin";
 
-  users.extraUsers.bla = {
+  users.users.bla = {
     isNormalUser = true;
     uid = 1000;
     extraGroups = [ "video" "wheel" ];
diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix
index 17c5cc7e..539f0346 100644
--- a/machines/aszlig/mmrnmhrm-kconf.nix
+++ b/machines/aszlig/mmrnmhrm-kconf.nix
@@ -8,8 +8,11 @@
   "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig";
   "CONFIG_LOCKDEP_SUPPORT" = "y";
   "CONFIG_STACKTRACE_SUPPORT" = "y";
-  "CONFIG_HAVE_LATENCYTOP_SUPPORT" = "y";
   "CONFIG_MMU" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS_MIN" = "28";
+  "CONFIG_ARCH_MMAP_RND_BITS_MAX" = "32";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN" = "8";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX" = "16";
   "CONFIG_NEED_DMA_MAP_STATE" = "y";
   "CONFIG_NEED_SG_DMA_LENGTH" = "y";
   "CONFIG_GENERIC_ISA_DMA" = "y";
@@ -100,22 +103,21 @@
   "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y";
   "CONFIG_ARCH_SUPPORTS_INT128" = "y";
   "CONFIG_CGROUPS" = "y";
-  "CONFIG_CGROUP_FREEZER" = "y";
-  "CONFIG_CGROUP_PIDS" = "y";
-  "CONFIG_CGROUP_DEVICE" = "y";
-  "CONFIG_CPUSETS" = "y";
-  "CONFIG_CGROUP_CPUACCT" = "y";
   "CONFIG_PAGE_COUNTER" = "y";
   "CONFIG_MEMCG" = "y";
   "CONFIG_MEMCG_SWAP" = "y";
   "CONFIG_MEMCG_SWAP_ENABLED" = "y";
-  "CONFIG_MEMCG_KMEM" = "y";
-  "CONFIG_CGROUP_PERF" = "y";
+  "CONFIG_BLK_CGROUP" = "y";
+  "CONFIG_CGROUP_WRITEBACK" = "y";
   "CONFIG_CGROUP_SCHED" = "y";
   "CONFIG_FAIR_GROUP_SCHED" = "y";
   "CONFIG_CFS_BANDWIDTH" = "y";
-  "CONFIG_BLK_CGROUP" = "y";
-  "CONFIG_CGROUP_WRITEBACK" = "y";
+  "CONFIG_CGROUP_PIDS" = "y";
+  "CONFIG_CGROUP_FREEZER" = "y";
+  "CONFIG_CPUSETS" = "y";
+  "CONFIG_CGROUP_DEVICE" = "y";
+  "CONFIG_CGROUP_CPUACCT" = "y";
+  "CONFIG_CGROUP_PERF" = "y";
   "CONFIG_NAMESPACES" = "y";
   "CONFIG_UTS_NS" = "y";
   "CONFIG_IPC_NS" = "y";
@@ -175,7 +177,6 @@
   "CONFIG_HAVE_OPTPROBES" = "y";
   "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
-  "CONFIG_HAVE_DMA_ATTRS" = "y";
   "CONFIG_HAVE_DMA_CONTIGUOUS" = "y";
   "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y";
   "CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT" = "y";
@@ -208,6 +209,10 @@
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
   "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y";
   "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y";
+  "CONFIG_HAVE_ARCH_MMAP_RND_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_BITS" = "28";
+  "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y";
+  "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8";
   "CONFIG_HAVE_COPY_THREAD_TLS" = "y";
   "CONFIG_OLD_SIGSUSPEND3" = "y";
   "CONFIG_COMPAT_OLD_SIGACTION" = "y";
@@ -221,7 +226,6 @@
   "CONFIG_MODULE_FORCE_UNLOAD" = "y";
   "CONFIG_MODVERSIONS" = "y";
   "CONFIG_MODULES_TREE_LOOKUP" = "y";
-  "CONFIG_STOP_MACHINE" = "y";
   "CONFIG_BLOCK" = "y";
   "CONFIG_BLK_DEV_BSG" = "y";
   "CONFIG_BLK_DEV_INTEGRITY" = "y";
@@ -252,6 +256,7 @@
   "CONFIG_ZONE_DMA" = "y";
   "CONFIG_SMP" = "y";
   "CONFIG_X86_FEATURE_NAMES" = "y";
+  "CONFIG_X86_FAST_FEATURE_TESTS" = "y";
   "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y";
   "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y";
   "CONFIG_NO_BOOTMEM" = "y";
@@ -416,6 +421,7 @@
   "CONFIG_PMC_ATOM" = "y";
   "CONFIG_NET" = "y";
   "CONFIG_NET_INGRESS" = "y";
+  "CONFIG_NET_EGRESS" = "y";
   "CONFIG_PACKET" = "y";
   "CONFIG_PACKET_DIAG" = "m";
   "CONFIG_UNIX" = "y";
@@ -438,7 +444,6 @@
   "CONFIG_DEFAULT_TCP_CONG" = "cubic";
   "CONFIG_IPV6" = "y";
   "CONFIG_IPV6_ROUTER_PREF" = "y";
-  "CONFIG_IPV6_ILA" = "m";
   "CONFIG_INET6_TUNNEL" = "m";
   "CONFIG_IPV6_SIT" = "m";
   "CONFIG_IPV6_NDISC_NODETYPE" = "y";
@@ -512,6 +517,7 @@
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
+  "CONFIG_SOCK_CGROUP_DATA" = "y";
   "CONFIG_CGROUP_NET_CLASSID" = "y";
   "CONFIG_NET_RX_BUSY_POLL" = "y";
   "CONFIG_BQL" = "y";
@@ -589,8 +595,11 @@
   "CONFIG_INPUT_JOYDEV" = "y";
   "CONFIG_INPUT_EVDEV" = "y";
   "CONFIG_INPUT_KEYBOARD" = "y";
-  "CONFIG_KEYBOARD_ATKBD" = "y";
   "CONFIG_INPUT_MOUSE" = "y";
+  "CONFIG_INPUT_JOYSTICK" = "y";
+  "CONFIG_JOYSTICK_XPAD" = "y";
+  "CONFIG_JOYSTICK_XPAD_FF" = "y";
+  "CONFIG_JOYSTICK_XPAD_LEDS" = "y";
   "CONFIG_INPUT_TABLET" = "y";
   "CONFIG_SERIO" = "y";
   "CONFIG_ARCH_MIGHT_HAVE_PC_SERIO" = "y";
@@ -675,6 +684,7 @@
   "CONFIG_DRM_BRIDGE" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CMDLINE" = "y";
+  "CONFIG_FB_NOTIFY" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
   "CONFIG_FB_CFB_IMAGEBLIT" = "y";
@@ -737,8 +747,11 @@
   "CONFIG_HIDRAW" = "y";
   "CONFIG_UHID" = "m";
   "CONFIG_HID_GENERIC" = "y";
+  "CONFIG_HID_MICROSOFT" = "m";
   "CONFIG_HID_GREENASIA" = "y";
   "CONFIG_GREENASIA_FF" = "y";
+  "CONFIG_HID_SENSOR_HUB" = "m";
+  "CONFIG_HID_SENSOR_CUSTOM_SENSOR" = "m";
   "CONFIG_USB_HID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
   "CONFIG_I2C_HID" = "m";
@@ -806,6 +819,7 @@
   "CONFIG_USB_SERIAL_METRO" = "m";
   "CONFIG_USB_SERIAL_MOS7720" = "m";
   "CONFIG_USB_SERIAL_MOS7840" = "m";
+  "CONFIG_USB_SERIAL_MXUPORT11" = "m";
   "CONFIG_USB_SERIAL_MXUPORT" = "m";
   "CONFIG_USB_SERIAL_NAVMAN" = "m";
   "CONFIG_USB_SERIAL_PL2303" = "m";
@@ -860,6 +874,7 @@
   "CONFIG_CLKEVT_I8253" = "y";
   "CONFIG_I8253_LOCK" = "y";
   "CONFIG_CLKBLD_I8253" = "y";
+  "CONFIG_ARM_GIC_MAX_NR" = "1";
   "CONFIG_RAS" = "y";
   "CONFIG_LIBNVDIMM" = "m";
   "CONFIG_ND_BLK" = "m";
@@ -1029,7 +1044,10 @@
   "CONFIG_TEST_HEXDUMP" = "m";
   "CONFIG_MEMTEST" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
+  "CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL" = "y";
+  "CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
+  "CONFIG_IO_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
   "CONFIG_EARLY_PRINTK" = "y";
   "CONFIG_DOUBLEFAULT" = "y";
@@ -1261,6 +1279,7 @@
   "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y";
   "CONFIG_CLZ_TAB" = "y";
   "CONFIG_CORDIC" = "y";
+  "CONFIG_IRQ_POLL" = "y";
   "CONFIG_MPILIB" = "m";
   "CONFIG_OID_REGISTRY" = "y";
   "CONFIG_FONT_SUPPORT" = "y";
diff --git a/machines/aszlig/mmrnmhrm.nix b/machines/aszlig/mmrnmhrm.nix
index 49826d9b..b9d422e6 100644
--- a/machines/aszlig/mmrnmhrm.nix
+++ b/machines/aszlig/mmrnmhrm.nix
@@ -23,12 +23,7 @@ with lib;
     "/" = {
       label = "root";
       fsType = "btrfs";
-      options = concatStringsSep "," [
-        "autodefrag"
-        "space_cache"
-        "compress=lzo"
-        "noatime"
-      ];
+      options = [ "autodefrag" "space_cache" "compress=lzo" "noatime" ];
     };
   };
 
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index a3f281f4..3232d222 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -40,17 +40,13 @@ in {
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/${rootUUID}";
     fsType = "btrfs";
-    options = concatStringsSep "," [
-      "space_cache" "compress=zlib" "noatime"
-    ];
+    options = [ "space_cache" "compress=zlib" "noatime" ];
   };
 
   fileSystems."/nix/store" = {
     device = "/dev/disk/by-uuid/${storeUUID}";
     fsType = "btrfs";
-    options = concatStringsSep "," [
-      "ssd" "compress-force=zlib" "noatime"
-    ];
+    options = [ "ssd" "compress-force=zlib" "noatime" ];
   };
 
   swapDevices = singleton {
diff --git a/machines/default.nix b/machines/default.nix
index 7c0ed379..d15bd7eb 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -10,7 +10,6 @@ in {
     kzerza    = callMachine ./aszlig/kzerza.nix {};
     tishtushi = callMachine ./aszlig/tishtushi.nix {};
     managed = {
-      haenk   = callMachine ./aszlig/managed/haenk.nix {};
       notsure = callMachine ./aszlig/managed/notsure.nix {};
       tyree   = callMachine ./aszlig/managed/tyree.nix {};
     };
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 65e3723d..a206f93c 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -1,28 +1,6 @@
 { pkgs, lib, ... }:
 
 let
-  greybird = pkgs.stdenv.mkDerivation {
-    name = "greybird-xfce-theme";
-
-    src = pkgs.fetchFromGitHub {
-      repo = "Greybird";
-      owner = "shimmerproject";
-      rev = "61ec18d22780aa87998381599c941e0cf4f7bfb5";
-      sha256 = "03h8hba4lfp337a4drylcplrbggry9gz8dq1f3gjy25fhqkgvq05";
-    };
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
-      mkdir -p "$out/share/themes/Greybird" \
-               "$out/share/themes/Greybird-compact/xfwm4"
-      cp -vrt "$out/share/themes/Greybird" \
-        gtk-* metacity-1 unity xfce-notify-4.0 xfwm4
-      cp -vrt "$out/share/themes/Greybird-compact/xfwm4" \
-        xfwm4_compact/*
-    '';
-  };
-
   modulesPath = "${import ../../nixpkgs-path.nix}/nixos/modules";
 
 in {
@@ -48,6 +26,8 @@ in {
 
   vuizvui.hardware.thinkpad.enable = true;
 
+  hardware.trackpoint.enable = false;
+
   environment.systemPackages = with pkgs; [
     #repetierhost <- TODO
     ack
@@ -62,7 +42,6 @@ in {
     gimp
     git
     gmpc
-    vuizvui.greybird-xfce-theme
     inkscape
     ino
     (libreoffice.overrideDerivation (lib.const { doCheck = false; }))
@@ -85,21 +64,12 @@ in {
 
     displayManager.auto.enable = true;
     displayManager.auto.user = "openlab";
-    desktopManager.xfce.enable = true;
-    # synaptics.enable = true;
-    # synaptics.minSpeed = "0.5";
-    # synaptics.accelFactor = "0.01";
+    desktopManager.gnome3.enable = true;
+    synaptics.enable = true;
+    synaptics.minSpeed = "0.5";
+    synaptics.accelFactor = "0.01";
   };
 
-
-  # hardware.trackpoint = {
-  #   enable = true;
-  #   emulateWheel = true;
-  #   sensitivity = 130;
-  #   speed = 350;
-  # };
-
-
   services.openssh.enable = true;
 
   networking.networkmanager.enable = true;
@@ -114,7 +84,7 @@ in {
   nix.maxJobs = 2;
 
   users.mutableUsers = false;
-  users.extraUsers.openlab = {
+  users.users.openlab = {
     uid = 1000;
     isNormalUser = true;
     password = "openlab";
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 98074e41..73f0430c 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -299,7 +299,7 @@ in {
 
     # Nobody wants mutable state. :)
     users.mutableUsers = false;
-    users.extraUsers =
+    users.users =
       let authKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJhthfk38lzDvoI7lPqRneI0yBpZEhLDGRBpcXzpPSu+V0YlgrDix5fHhBl+EKfw4aeQNvQNuAky3pDtX+BDK1b7idbz9ZMCExy2a1kBKDVJz/onLSQxiiZMuHlAljVj9iU4uoTOxX3vB85Ok9aZtMP1rByRIWR9e81/km4HdfZTCjFVRLWfvo0s29H7l0fnbG9bb2E6kydlvjnXJnZFXX+KUM16X11lK53ilPdPJdm87VtxeSKZ7GOiBz6q7FHzEd2Zc3CnzgupQiXGSblXrlN22IY3IWfm5S/8RTeQbMLVoH0TncgCeenXH7FU/sXD79ypqQV/WaVVDYMOirsnh/ philip@nyx"];
       in {
         philip = rec {
diff --git a/machines/sternenseemann/fliewatuet.nix b/machines/sternenseemann/fliewatuet.nix
index 6c8994ee..94d84287 100644
--- a/machines/sternenseemann/fliewatuet.nix
+++ b/machines/sternenseemann/fliewatuet.nix
@@ -256,7 +256,7 @@ in {
   programs.fish.enable = true;
 
   users.mutableUsers = false;
-  users.extraUsers.lukas = {
+  users.users.lukas = {
     isNormalUser = true;
     uid = 1000;
     home = "/home/lukas";
diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix
index e1bf9f63..fc38373f 100644
--- a/machines/sternenseemann/schnurrkadse.nix
+++ b/machines/sternenseemann/schnurrkadse.nix
@@ -16,8 +16,16 @@
     ];
 
   nix.maxJobs = 1;
-  networking.enableIntel2200BGFirmware = true;
-  hardware.enableAllFirmware = true;
+  hardware.firmware = let myfirmware = pkgs.firmwareLinuxNonfree.overrideDerivation
+    (old: {
+      name = "myfirmware";
+      src = pkgs.fetchFromGitHub {
+        owner = "wkennington";
+        repo = "linux-firmware";
+        rev = "2016-01-26";
+        sha256="07hv4kgbsxndhm1va6k6scy083886aap3naq1l4jdz7dnph4ir02";
+      };
+    }); in [ myfirmware ];
 
   hardware.trackpoint = {
     enable = true;
@@ -96,7 +104,7 @@
 
   programs.fish.enable = true;
 
-  users.extraUsers.lukas = {
+  users.users.lukas = {
     isNormalUser = true;
     uid = 1000;
     shell = "/run/current-system/sw/bin/fish";