diff --git a/hosts/apps-desktop.nix b/hosts/apps-desktop.nix
index cde2fe7..4d2cd25 100644
--- a/hosts/apps-desktop.nix
+++ b/hosts/apps-desktop.nix
@@ -16,12 +16,13 @@
     protonmail-bridge
 
     # GNOME apps
-    gnome.cheese
-    gnome.nautilus
-    gnome.file-roller
-    gnome.gnome-calculator
-    gnome.gnome-disk-utility
-    gnome.simple-scan
+    cheese
+    nautilus
+    file-roller
+    gnome-calculator
+    gnome-disk-utility
+    simple-scan
+    ghex
 
     # Applications
     anki
@@ -34,7 +35,6 @@
     qbittorrent
     pureref
     libreoffice
-    gnome.ghex
     evince
     pdfsam-basic
     steam
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 2925a4b..7613383 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -9,6 +9,11 @@ in
    xserver = {
       enable = true;
       xkb.options = "caps:escape";
+      windowManager.i3 = {
+        enable = true;
+        # Don't install dmenu, i3status, and i3lock
+        extraPackages = lib.mkOverride 0 [];
+      };
       displayManager = {
         lightdm = {
           enable = true;
@@ -18,14 +23,11 @@ in
           };
           background = theme.wallpaper;
         };
-        defaultSession = "none+i3";
-      };
-      windowManager.i3 = {
-        enable = true;
-        # Don't install dmenu, i3status, and i3lock
-        extraPackages = lib.mkOverride 0 [];
       };
     };
+    displayManager = {
+      defaultSession = "none+i3";
+    };
     udev.packages = [ pkgs.yubikey-personalization ];
     pcscd.enable = true;
     gnome.gnome-keyring.enable = true; # For remembering nextcloud login, among other things
@@ -76,15 +78,15 @@ in
   fonts = {
     enableDefaultPackages = false;
     packages = with pkgs; [
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts
-      (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
+      nerd-fonts.fira-code # required for icons
       twitter-color-emoji
     ];
   };
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true; # Required for Touhou, Steam
+    enable32Bit = true; # Required for Touhou, Steam
   };
 }
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 18030f7..f615cbe 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -14,6 +14,7 @@
   hardware.enableAllFirmware = true;
   hardware.enableRedistributableFirmware = true;
   hardware.bluetooth.enable = true;
+  hardware.nvidia.open = true;
 
   fileSystems = {
     "/" = {
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index 018af3a..a2cd93c 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -11,6 +11,7 @@ let
   };
 in
 {
+  # TODO broken as of 2025-03-21
   nixpkgs = {
     config.allowUnfree = true;
     overlays = [
@@ -52,7 +53,8 @@ in
         "browser.backspace_action" = 0;
         "extensions.unifiedExtensions.enabled" = false;
       };
-      userChrome = builtins.readFile "${firefox-csshacks}/chrome/autohide_toolbox.css";
+      # TODO broken as of 2025-03-21
+      # userChrome = builtins.readFile "${firefox-csshacks}/chrome/autohide_toolbox.css";
     };
   };
 }
diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index bf1b520..605a739 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -9,7 +9,9 @@ in with theme.colors; {
     playerctl # pactl comes with PulseAudio
     wmctrl # For rofi power menu
     xborders # Active window borders
-    maim xdotool unclutter # Active window screenshots
+    maim xdotool
+    # TODO build failure https://github.com/NixOS/nixpkgs/issues/388196
+    # unclutter # Active window screenshots
     #xsel # Disable middle mouse paste
   ];
 
diff --git a/modules/polybar/aozora.nix b/modules/polybar/aozora.nix
index 9915750..9169b67 100644
--- a/modules/polybar/aozora.nix
+++ b/modules/polybar/aozora.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "93MP1Iw1eklC+IEQXAhzLHJ+qsDASm53qw7vUEtEstI=";
   };
 
-  cargoSha256 = "fiDdk6c1rPS6L//KKqfp6ODxcLEzNKrpySCb9n8aGQ0=";
+  cargoHash = "sha256-aBuaXckalcBcfr/snUy+8W9ZITehoeMCsGt/4yb2BxA=";
 
   meta = with lib; {
     description = "A simple CLI for fetching Plume Labs air quality info.";
diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix
index 67799b3..cf1e737 100644
--- a/modules/terminal/default.nix
+++ b/modules/terminal/default.nix
@@ -7,7 +7,8 @@ in
   programs.kitty = { 
     enable = true;
     # https://github.com/kovidgoyal/kitty-themes/blob/master/themes.json
-    theme = "${theme.kitty-theme}";
+    # TODO fix this, the way themes work changed
+    # theme = "${theme.kitty-theme}";
     font = {
       name = "FiraCode Nerd Font Mono";
       size = 12;