diff --git a/actions/steps.nix b/actions/steps.nix
index 79a0c907..fa75a39a 100644
--- a/actions/steps.nix
+++ b/actions/steps.nix
@@ -9,8 +9,6 @@ with constants;
     "with" = {
       swap-storage = false;
       tool-cache = true;
-      opt = true;
-      usrlocal = true;
     };
   };
   checkoutStep = {
diff --git a/nixos/desktop/audio.nix b/nixos/desktop/audio.nix
index 31f61a87..e6ceee00 100644
--- a/nixos/desktop/audio.nix
+++ b/nixos/desktop/audio.nix
@@ -32,12 +32,7 @@ in
 
     services = {
       pipewire = {
-        enable = true;
-        alsa = {
-          enable = true;
-          support32Bit = true;
-        };
-        pulse.enable = true;
+        alsa.support32Bit = config.nixos.desktop.games.enable;
         extraConfig = lib.mkIf cfg.lowLatency.enable {
           pipewire."92-low-latency" = {
             context.properties = {
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index 3b5c3bb0..49b060fe 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -44,6 +44,7 @@ in
     services = {
       dbus.implementation = "broker";
       gnome.gnome-keyring.enable = true;
+      graphical-desktop.enable = true;
       udisks2.enable = true;
     };
 
diff --git a/nixos/desktop/fonts.nix b/nixos/desktop/fonts.nix
index 9d4bd5ff..690b0cae 100644
--- a/nixos/desktop/fonts.nix
+++ b/nixos/desktop/fonts.nix
@@ -12,7 +12,6 @@
 
   config = lib.mkIf config.nixos.desktop.fonts.enable {
     fonts = {
-      enableDefaultPackages = true;
       fontDir.enable = true;
 
       packages = with pkgs; [