diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 509ed29b..aca5ebc6 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1483,6 +1483,7 @@ The file server file for this emacs instance no longer exists.")
 ** beacon
 #+BEGIN_SRC emacs-lisp
 (use-package beacon
+  :disabled t
   :demand t
   :diminish beacon-mode
   :bind ("C-c b" . beacon-blink)
diff --git a/nixos/extra.nix b/nixos/extra.nix
index 22c2858e..35cbecca 100644
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -1,5 +1,7 @@
 { config, pkgs, ... }:
 {
+  programs.sway.enable = true;
+  services.xserver.windowManager.i3.enable = true;
   environment.systemPackages = with pkgs; [
     asciidoctor
     gource
diff --git a/nixos/flake.lock b/nixos/flake.lock
index cef15172..795c12a3 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -62,7 +62,7 @@
         ]
       },
       "locked": {
-        "narHash": "sha256-OtY5KlTU1TOydDiFTjPx0lCZmfLwdWEagm0C1NROErU=",
+        "narHash": "sha256-CBJguKlUR3DInWleAYhkqA9ujMjKazdThSHK84peKFQ=",
         "path": "./home-manager",
         "type": "path"
       },
@@ -127,7 +127,7 @@
     },
     "nixpkgs": {
       "locked": {
-        "narHash": "sha256-vBvIKuTZfH6H62RTomwSLCg0HwTsTzGsd0WCfxsuB7U=",
+        "narHash": "sha256-xifLAB3xxYZKkx0I0w7lZKsABhgbqLZQ+ctR6Z3KpI4=",
         "path": "./nixpkgs",
         "type": "path"
       },
@@ -138,8 +138,8 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
-        "path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
+        "narHash": "sha256-xifLAB3xxYZKkx0I0w7lZKsABhgbqLZQ+ctR6Z3KpI4=",
+        "path": "./nixpkgs",
         "type": "path"
       },
       "original": {
@@ -149,8 +149,8 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
-        "path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
+        "narHash": "sha256-xifLAB3xxYZKkx0I0w7lZKsABhgbqLZQ+ctR6Z3KpI4=",
+        "path": "./nixpkgs",
         "type": "path"
       },
       "original": {
@@ -160,8 +160,8 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
-        "path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
+        "narHash": "sha256-xifLAB3xxYZKkx0I0w7lZKsABhgbqLZQ+ctR6Z3KpI4=",
+        "path": "./nixpkgs",
         "type": "path"
       },
       "original": {
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index fe6ae070..d6f338e0 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }: {
+{ pkgs, config, ... }: {
   xsession = {
     enable = true;
     preferStatusNotifierItems = true;
+    importedVariables = [ "GDK_PIXBUF_ICON_LOADER" ];
     profileExtra = ''
       export ROFI_SYSTEMD_TERM="alacritty -e"
       . "$HOME/.lib/login.sh"
@@ -27,10 +28,6 @@
     enableSshSupport = true;
   };
 
-  services.picom = {
-    enable = true;
-  };
-
   services.blueman-applet = {
     enable = false;
   };
@@ -91,4 +88,22 @@
       }
     ];
   };
+
+  systemd.user.services.picom = {
+    Unit = {
+      Description = "Picom X11 compositor";
+      After = [ "graphical-session-pre.target" ];
+      PartOf = [ "graphical-session.target" ];
+    };
+
+    Install = { WantedBy = [ "graphical-session.target" ]; };
+
+    Service = {
+      # Temporarily fixes corrupt colours with Mesa 18.
+      Environment = [ "allow_rgb10_configs=false" ];
+      ExecStart = "${pkgs.picom}/bin/picom";
+      Restart = "always";
+      RestartSec = 3;
+    };
+  };
 }