diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index bd71a62..0192c3f 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -360,6 +360,8 @@ in {
       gnome3.dconf
       picocom
       glib.dev # contains gdbus tool
+      alacritty
+      roxterm
 
       # Screen recording
       # gtk-recordmydesktop # can't select the window
diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix
index e1c31b3..da14963 100644
--- a/nix/home-manager/profiles/qtile-desktop.nix
+++ b/nix/home-manager/profiles/qtile-desktop.nix
@@ -31,8 +31,11 @@ let
         exit 1
         ;;
     esac
-
   '';
+  # FIXME: alacritty's reflow on grow is currently broken (on my system)
+  terminalCommand = "${pkgs.alacritty}/bin/alacritty";
+  # terminalCommand = "${pkgs.roxterm}/bin/roxterm";
+
 
   qtileConfig = pkgs.writeScript "qtile_config.py" ''
 from libqtile.config import Key, Screen, Group, Drag, Click
@@ -97,9 +100,9 @@ key_control = "control"
 
 keys = [
     # https://github.com/qtile/qtile/blob/develop/libqtile/xkeysyms.py
-    Key([key_super], "Return", lazy.spawn("${pkgs.roxterm}/bin/roxterm")),
-    Key([key_super], "backslash", lazy.spawn("${pkgs.roxterm}/bin/roxterm")),
-    Key([key_super], "apostrophe", lazy.spawn("${pkgs.roxterm}/bin/roxterm")),
+    Key([key_super], "Return", lazy.spawn("${terminalCommand}")),
+    Key([key_super], "backslash", lazy.spawn("${terminalCommand}")),
+    Key([key_super], "apostrophe", lazy.spawn("${terminalCommand}")),
     Key([key_super], "r", lazy.spawncmd()),
     Key([key_super], "w", lazy.window.kill()),
 
diff --git a/nix/overlay.nix b/nix/overlay.nix
index 3394b5c..9d2e289 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,10 +1,8 @@
 self: super:
 
 let
-  nixpkgs-master = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs-channels/archive/de5fd9e6110489722e8667664dce9fdc17331866.tar.gz";
-    sha256 = "0z1j2pmvn15m2ir2i9l2prr81cq7f1x8xs4cv2s7q4fslz586ghn";
-  }) {};
+  nixpkgs-master = import <nixpkgs-master> {};
+
   # one application requires php5
   nixpkgsWithPhp5 = super.fetchFromGitHub {
     owner = "nixos";
@@ -14,6 +12,7 @@ let
   };
 
 in {
+  alacritty = nixpkgs-master.alacritty;
   podman = nixpkgs-master.podman;
   conmon = nixpkgs-master.conmon;
 
@@ -23,6 +22,16 @@ in {
   slirp4netns = super.callPackage ./pkgs/slirp4netns.nix {};
   staruml = super.callPackage ./pkgs/staruml.nix { inherit (super.gnome2) GConf; libgcrypt = super.libgcrypt_1_5; };
 
+  roxterm = super.stdenv.mkDerivation {
+    name = "roxterm-custom";
+    buildInputs = [ super.makeWrapper ];
+    phases = "installPhase";
+    installPhase = ''
+      makeWrapper ${super.roxterm}/bin/roxterm $out/bin/roxterm \
+        --add-flags "--separate"
+    '';
+  };
+
   busyboxStatic =  super.busybox.override {
     enableStatic = true;
     extraConfig = ''