diff --git a/archachatina.nix b/archachatina.nix
index 671a739..09e6417 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -44,6 +44,8 @@
     uvccapture
   ];
 
+  # programs.ratbag.enable = true;
+
   services.thermald.enable = true;
 
   virtualisation.docker.enable = true;
@@ -85,9 +87,18 @@
 
   services.xserver = {
     videoDrivers = [ "amdgpu" ];
-    # useGlamor = true;
+    deviceSection = ''
+      Option "TearFree" "on"
+    '';
   };
 
   services.transmission.enable = true;
 
+  nix.package = pkgs.nixUnstable;
+
+  services.postgresql = {
+    enable = true;
+    extraPlugins = [ pkgs.postgis.v_2_4_0 ];
+  };
+
 }
diff --git a/basic-tools.nix b/basic-tools.nix
index b978a84..17178bd 100644
--- a/basic-tools.nix
+++ b/basic-tools.nix
@@ -6,6 +6,7 @@
     # nox
     wget
     neovim
+    neovim-remote
     zsh
     gitFull gitAndTools.hub tig
     gnumake
diff --git a/common-headless.nix b/common-headless.nix
index 5266dec..98d3ad5 100644
--- a/common-headless.nix
+++ b/common-headless.nix
@@ -56,19 +56,19 @@
   fileSystems."/mnt/vaccaria" = {
     device = "//vaccaria.mtlaa.gebner.org/export";
     fsType = "cifs";
-    options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/vaccaria" ];
+    options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/vaccaria" "vers=1.0" ];
   };
 
   fileSystems."/mnt/aplysia" = {
     device = "//aplysia.mtlaa.gebner.org/export";
     fsType = "cifs";
-    options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aplysia" ];
+    options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aplysia" "vers=1.0" ];
   };
 
   fileSystems."/mnt/aruanus" = {
     device = "//aruanus.htdf.gebner.org/export";
     fsType = "cifs";
-    options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aruanus" ];
+    options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aruanus" "vers=1.0" ];
   };
 
   users.extraUsers.gebner = {
diff --git a/common-sw.nix b/common-sw.nix
index 6483cb6..00a9f61 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -30,6 +30,9 @@
     imagemagick
     mercurial
 
+    alacritty
+    neovim-qt
+
     androidenv.platformTools # adb & fastboot
 
     lm_sensors
@@ -49,7 +52,7 @@
     ghostscript # for auctex
     aspell
 
-    nodejs
+    nodejs-8_x
 
     mediainfo
 
@@ -72,7 +75,6 @@
     cvc4
     graphviz
     # toysolver
-    stable.haskellPackages.tip-lib
 
     emacsPackages.proofgeneral
 
@@ -87,8 +89,8 @@
       repo = "nixpkgs-channels";
     };
     stablePkgs = fetchNixPkgs {
-      rev = "5237768d62a40236d24fafbd9f4f97f3227399ce";
-      sha256 = "1j707pwm6ll2cvmqvwfxxq21gd9q7l6s3vi3vc01jklplj2v20is";
+      rev = "1a8a95e87962bc8ff8514b28e026fc987fbdb010";
+      sha256 = "1rx14g8wlw6vdjalsv6rnznmfsazwf218rv75z9ac2vdgwihclxh";
     };
   in {
     # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
diff --git a/decoysnail.nix b/decoysnail.nix
index 0a0c58f..4ec197e 100644
--- a/decoysnail.nix
+++ b/decoysnail.nix
@@ -37,4 +37,6 @@
 
   services.avahi.nssmdns = true;
 
+  nix.package = pkgs.nixUnstable;
+
 }
diff --git a/i3.nix b/i3.nix
index c56b00d..ac6d689 100644
--- a/i3.nix
+++ b/i3.nix
@@ -86,7 +86,7 @@
         start = ''
           export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
           export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
-          export XDG_CURRENT_DESKTOP=GNOME
+          export XDG_CURRENT_DESKTOP=X-Generic
           for m in xsettings; do
             ${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m &
           done
diff --git a/large-sw.nix b/large-sw.nix
index 75e39dc..c499afd 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -20,6 +20,7 @@
 
     stack
 
+    lean
     coq_8_6
 
     # cargo rustc
diff --git a/petalius.nix b/petalius.nix
index 11cbbe5..392a09c 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -46,10 +46,10 @@
   networking.hostName = "petalius";
   networking.hostId = "cf58caa9";
 
-  systemd.services.ModemManager = {
-    enable = true;
-    wantedBy = [ "multi-user.target" ];
-  };
+  # systemd.services.ModemManager = {
+  #   enable = true;
+  #   wantedBy = [ "multi-user.target" ];
+  # };
 
   hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
 
@@ -66,7 +66,7 @@
   };
   users.extraUsers.gebner.extraGroups = [ "docker" ];
 
-  #virtualisation.virtualbox.host.enable = true;
+  virtualisation.virtualbox.host.enable = true;
 
   # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
   boot.kernelPatches = [
@@ -82,8 +82,10 @@
     "psmouse"
   ];
 
-  # time.timeZone = pkgs.lib.mkOverride 10 "Europe/London";
+  # time.timeZone = pkgs.lib.mkOverride 10 "Asia/Tokyo";
 
   #services.avahi.nssmdns = true;
 
+  nix.package = pkgs.nixUnstable;
+
 }
diff --git a/theba.nix b/theba.nix
deleted file mode 100644
index cad88ac..0000000
--- a/theba.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [
-      ./common.nix
-      ./large-sw.nix
-      ./uefi.nix
-      ./fstrim.nix
-    ];
-
-  environment.etc."lvm/lvm.conf".text = ''
-    devices {
-      issue_discards = 1
-    }
-  '';
-  boot.initrd.luks.devices = [
-    {
-      name = "sda2_crypt";
-      device = "/dev/disk/by-uuid/a7482f34-1d7b-4181-9f3c-f6bbbdb8679d";
-      preLVM = true;
-      allowDiscards = true;
-    }
-  ];
-
-  services.xserver = {
-    libinput.enable = true;
-    config = ''
-      Section "InputClass"
-        Identifier "touchpad"
-        Driver "libinput"
-        MatchDevicePath "/dev/input/event*"
-        MatchIsPointer "true"
-      EndSection
-    '';
-
-    videoDrivers = [ "modesetting" ];
-    useGlamor = true;
-  };
-  programs.light.enable = true;
-
-  services.tlp.enable = true;
-
-  networking.hostName = "theba"; # Define your hostname.
-  networking.hostId = "b29b900f";
-
-  # services.colord.enable = true;
-
-  systemd.services.ModemManager.enable = true;
-
-  hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
-
-  nixpkgs.config.packageOverrides = pkgs: rec {
-  };
-
-  environment.systemPackages = with pkgs; [
-    unison
-  ];
-
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "overlay2";
-  };
-  users.extraUsers.gebner.extraGroups = [ "docker" ];
-
-  # virtualisation.virtualbox.host.enable = true;
-
-  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
-
-  # time.timeZone = pkgs.lib.mkOverride 10 "Europe/London";
-
-  services.avahi.nssmdns = true;
-
-}
diff --git a/vaccaria.nix b/vaccaria.nix
index 96faa85..21442f2 100644
--- a/vaccaria.nix
+++ b/vaccaria.nix
@@ -79,14 +79,14 @@
     let fancontrolConfig = pkgs.writeText "fancontrol" ''
       # Configuration file generated by pwmconfig, changes will be lost
       INTERVAL=10
-      DEVPATH=hwmon0=devices/pci0000:00/0000:00:18.3 hwmon2=devices/platform/it87.552
-      DEVNAME=hwmon0=k10temp hwmon2=it8720
-      FCTEMPS=hwmon2/pwm3=hwmon0/temp1_input hwmon2/pwm1=hwmon0/temp1_input
-      FCFANS=hwmon2/pwm3=hwmon2/fan1_input hwmon2/pwm1=hwmon2/fan1_input
-      MINTEMP=hwmon2/pwm3=40 hwmon2/pwm1=40
-      MAXTEMP=hwmon2/pwm3=65 hwmon2/pwm1=65
-      MINSTART=hwmon2/pwm3=150 hwmon2/pwm1=150
-      MINSTOP=hwmon2/pwm3=0 hwmon2/pwm1=100
+      DEVPATH=hwmon1=devices/pci0000:00/0000:00:18.3 hwmon0=devices/platform/it87.552
+      DEVNAME=hwmon1=k10temp hwmon0=it8720
+      FCTEMPS=hwmon0/pwm3=hwmon1/temp1_input hwmon0/pwm1=hwmon1/temp1_input
+      FCFANS=hwmon0/pwm3=hwmon0/fan1_input hwmon0/pwm1=hwmon0/fan1_input
+      MINTEMP=hwmon0/pwm3=40 hwmon0/pwm1=40
+      MAXTEMP=hwmon0/pwm3=65 hwmon0/pwm1=65
+      MINSTART=hwmon0/pwm3=150 hwmon0/pwm1=150
+      MINSTOP=hwmon0/pwm3=0 hwmon0/pwm1=100
     ''; in {
     description = "fancontrol from lm_sensors";
     wantedBy = ["multi-user.target"];
@@ -95,7 +95,7 @@
 
   # hdd spindown
   powerManagement.powerUpCommands = ''
-    ${pkgs.hdparm}/bin/hdparm -B127 -S100 /dev/sd{a,b,c,d,e,f}
+    ${pkgs.hdparm}/bin/hdparm -B128 -S0 /dev/sd{a,b,c,d,e,f}
   '';
 
 }