diff --git a/hardware/thinkpad-p1-gen3.nix b/hardware/thinkpad-p1-gen3.nix
index f3b1b1f..09bf447 100644
--- a/hardware/thinkpad-p1-gen3.nix
+++ b/hardware/thinkpad-p1-gen3.nix
@@ -56,7 +56,6 @@
       driSupport32Bit = true;
       extraPackages = with pkgs; [
         intel-media-driver # LIBVA_DRIVER_NAME=iHD
-        vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
         vaapiVdpau
         libvdpau-va-gl
         libva
diff --git a/hosts/helix-texta.nix b/hosts/helix-texta.nix
index 12ca364..9b7b41d 100644
--- a/hosts/helix-texta.nix
+++ b/hosts/helix-texta.nix
@@ -80,7 +80,7 @@
     };
     xdg.portal = {
       enable = true;
-      extraPortals = with pkgs; [xdg-desktop-portal-gtk xdg-desktop-portal-hyprland];
+      extraPortals = with pkgs; [xdg-desktop-portal-gtk];
     };
 
     services.udev.customRules = [
@@ -118,8 +118,8 @@
 
     # Use some fonts
     fonts = {
-      enableDefaultFonts = true;
-      fonts = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
+      enableDefaultPackages = true;
+      packages = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
       fontconfig = {
         enable = true;
         defaultFonts.monospace = ["Hack NF FC Ligatured"];
diff --git a/modules/malte.nix b/modules/malte.nix
index 9664646..10341d4 100644
--- a/modules/malte.nix
+++ b/modules/malte.nix
@@ -56,7 +56,7 @@ in {
       xwayland = {
         enable = true;
       };
-      nvidiaPatches = config.settings.nvidiaUsed;
+      enableNvidiaPatches = config.settings.nvidiaUsed;
     };
 
     sops.secrets = let
diff --git a/users/malte/hypr.nix b/users/malte/hypr.nix
index 2773692..7fcca5e 100644
--- a/users/malte/hypr.nix
+++ b/users/malte/hypr.nix
@@ -100,9 +100,7 @@
 
     # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
     input {
-        kb_layout    = us
-        kb_variant   =
-        kb_model     =
+        kb_variant   = workman
         kb_options   = ${
       if nixosConfig.networking.hostName == "helix-texta"
       then "compose:rctrl"
@@ -123,13 +121,14 @@
     }
 
     device:usb-hid-keyboard {
-        kb_layout  = us
-        kb_variant = workman
         kb_options = compose:rwin
     }
 
+    device:at-translated-set-2-keyboard {
+        kb_options   = "compose:rctrl"
+    }
+
     device:keyboardio-atreus {
-        kb_layout  = us
         kb_variant =
     }
 
@@ -149,10 +148,13 @@
         # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
         rounding               = 2
-        blur                   = yes
-        blur_size              = 3
-        blur_passes            = 1
-        blur_new_optimizations = on
+
+        blur {
+            enabled            = yes
+            size               = 3
+            passes             = 1
+            new_optimizations  = on
+        }
 
         drop_shadow            = yes
         shadow_range           = 4