diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
index 5443782..46330c3 100644
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -8,21 +8,15 @@ let
   customPackages = pkgs.callPackage ../../packages {};
 
   basePackages = with pkgs; [
-    bambu-studio
-    blender
+    #bambu-studio
     brightnessctl
-    ghostty
-    mangohud # Should probably get refactored with steam/gamescope out to a gaming role
-    protonup-qt
-
-    #customPackages.vulkanHDRLayer
+    emacs-nox
   ];
 
   x11BasePackages = with pkgs; [
   ];
 
   x11OnlyPackages = with pkgs; [
-    emacs
   ];
 
   waylandBasePackages = with pkgs; [
@@ -33,7 +27,6 @@ let
   ];
 
   waylandOnlyPackages = with pkgs; [
-    emacs-gtk
   ];
 in
 {
@@ -82,54 +75,6 @@ in
       programs.light.enable = mkIf (!cfg.x11Only) true;
 
       programs.kdeconnect.enable = true;
-      programs.java.enable = true;
-      programs.gamemode = {
-        enable = true;
-
-      };
-      programs.gamescope = {
-        enable = true;
-        #capSysNice = true;
-        args = [
-          #"--adaptive-sync"
-          #"--nested-refresh 165"
-          #"--backend wayland"
-          "--hdr-enabled"
-          "--hdr-itm-enable"
-          "--hdr-debug-force-output"
-          "--mangoapp"
-          "--rt"
-          "--steam"
-          #"--xwayland-count 2"
-        ];
-        env = {
-          #PROTON_DISABLE_NVAPI = "1";
-          MANGOHUD = "1";
-          #MANGOHUD_CONFIG = "cpu_temp gpu_temp ram vram";
-        };
-      };
-      programs.steam = {
-        enable = true;
-        remotePlay.openFirewall = true;
-        localNetworkGameTransfers.openFirewall = true;
-        gamescopeSession = {
-          enable = true;
-        };
-        extraCompatPackages = with pkgs; [
-          proton-ge-bin
-        ];
-        #package = pkgs.steam.override {
-        #withJava = true;
-        #withPrimus = true;
-        #extraPkgs = pkgs: [ bumblebee glxinfo ];
-        #};
-      };
-      services.sunshine = {
-        enable = true;
-        autoStart = false;
-        capSysAdmin = true;
-        openFirewall = true;
-      };
 
       virtualisation.docker.enable = true;
       users.extraGroups.docker.members = [ "johno" ];