diff --git a/home/home.nix b/home/home.nix
index a180b2a..3b16b8b 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -133,7 +133,7 @@ in {
 
   qt = mkIf graphics {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
     style = {
       name = "adwaita-dark";
       package = pkgs.adwaita-qt;
diff --git a/home/packages.nix b/home/packages.nix
index a05b975..4309552 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -37,8 +37,6 @@ in {
     ouch
     pandoc
     parallel
-    pinentry
-    pinentry-curses
     progress
     python3
     rclone
@@ -141,10 +139,11 @@ in {
     ] ++ lib.optionals (machineVars.laptop) [
       touchegg
     ] ++ lib.optionals (machineVars.gaming) [
-      citra
       desmume
-      minecraft
       osu-lazer
+      (prismlauncher.override {
+        jdk17 = jdk21;
+      })
       retroarchFull
       steam
       steam-tui
diff --git a/home/programs/gpg.nix b/home/programs/gpg.nix
index c709c5f..20819cb 100644
--- a/home/programs/gpg.nix
+++ b/home/programs/gpg.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 {
   programs.gpg = {
     enable = true;
@@ -14,7 +14,7 @@
 
   services.gpg-agent = {
     enable = true;
-    pinentryFlavor = "curses";
+    pinentryPackage = pkgs.pinentry-curses;
     enableExtraSocket = true;
     enableSshSupport = true;
     enableScDaemon = true;
diff --git a/home/shell.nix b/home/shell.nix
index c842d03..9b7b900 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -248,7 +248,7 @@ in {
       };
 
       m = p "ncmpcpp";
-      p = "${pkgs.python39Packages.ipython}/bin/ipython";
+      p = "${pkgs.python3Packages.ipython}/bin/ipython";
       s = p "sxiv";
       v = p "mpv";
       zt = p "zathura";
diff --git a/hosts/common.nix b/hosts/common.nix
index e68d467..2b4790e 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -342,14 +342,19 @@ in {
       ];
     };
 
+    libinput = {
+      enable = !config.machineVars.headless;
+      touchpad.disableWhileTyping = true;
+    };
+
+    displayManager.defaultSession = "none+xmonad";
+
     xserver = {
       enable = !config.machineVars.headless;
-      layout = "us";
-      xkbOptions = "caps:escape";
 
-      libinput = {
-        enable = true;
-        touchpad.disableWhileTyping = true;
+      xkb = {
+        layout = "us";
+        options = "caps:escape";
       };
 
       desktopManager = {
@@ -357,6 +362,8 @@ in {
         xfce.enable = !config.machineVars.headless;
       };
 
+      displayManager.lightdm.enable = !config.machineVars.headless;
+
       windowManager.xmonad = {
         enable = true;
         enableContribAndExtras = true;
@@ -366,8 +373,6 @@ in {
         ];
       };
 
-      displayManager.lightdm.enable = !config.machineVars.headless;
-      displayManager.defaultSession = "none+xmonad";
     };
 
   };
@@ -381,7 +386,7 @@ in {
     zsh.enable = true;
 
     gnupg.agent.enable = true;
-    gnupg.agent.pinentryFlavor = "curses";
+    gnupg.agent.pinentryPackage = pkgs.pinentry-curses;
 
     neovim = {
       enable = true;