diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix
index 74997e4..17c382e 100644
--- a/home/arrakis/default.nix
+++ b/home/arrakis/default.nix
@@ -14,6 +14,7 @@
     ../common/programs/desktop
     ../common/programs/zen-browser.nix
     ../common/programs/hyprland
+    ../common/programs/i3.nix
     ../common/programs/ghostty.nix
     ../common/programs/kitty.nix
     ../common/programs/syncthing.nix
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 8d3890d..4ffe907 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -30,7 +30,10 @@
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
-    kernelParams = [ "i915=force_probe=46a6" ];
+    kernelParams = [
+      "i915=force_probe=46a6"
+      "i915.enable_psr=0"
+    ];
   };
 
   system.stateVersion = "24.05";
@@ -53,7 +56,7 @@
       let
         authorizedKeys = pkgs.fetchurl {
           url = "https://github.com/naps62.keys";
-          sha256 = "sha256-O5JbzK5ulPob0HIrO8DT1MxfkC9bnfBw/0GR8Xu1tjw=";
+          sha256 = "sha256-L90zBt9vR4TqKj9wN2QsCvja4StgJsm/rdHuQSC9Mlg=";
         };
       in
       pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys);
diff --git a/hosts/common/features/display/x11.nix b/hosts/common/features/display/x11.nix
index 90610c1..7bc578b 100644
--- a/hosts/common/features/display/x11.nix
+++ b/hosts/common/features/display/x11.nix
@@ -5,7 +5,10 @@
     desktopManager = {
       gnome.enable = true;
     };
-    xserver.windowManager.i3.enable = true;
+    xserver = {
+      windowManager.i3.enable = true;
+      xkbOptions = "ctrl:nocaps";
+    };
     sysprof.enable = true;
     gnome = {
       glib-networking.enable = true;
diff --git a/hosts/common/features/gpu/intel-graphics.nix b/hosts/common/features/gpu/intel-graphics.nix
index 130364d..cfc0006 100644
--- a/hosts/common/features/gpu/intel-graphics.nix
+++ b/hosts/common/features/gpu/intel-graphics.nix
@@ -3,8 +3,12 @@
   services.xserver.videoDrivers = [ "intel" ];
   hardware.graphics = {
     enable = true;
+    enable32Bit = true;
     extraPackages = with pkgs; [
       vpl-gpu-rt # or intel-media-sdk for QSV
+      vaapiVdpau
+      intel-media-driver
+      intel-vaapi-driver
     ];
   };
 
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 0949bce..21f0510 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -63,7 +63,7 @@
       let
         authorizedKeys = pkgs.fetchurl {
           url = "https://github.com/naps62.keys";
-          sha256 = "sha256-O5JbzK5ulPob0HIrO8DT1MxfkC9bnfBw/0GR8Xu1tjw=";
+          sha256 = "sha256-L90zBt9vR4TqKj9wN2QsCvja4StgJsm/rdHuQSC9Mlg=";
         };
       in
       pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys);