diff --git a/hosts/architect/sunshine.nix b/hosts/architect/sunshine.nix
index ce12e99..c5cf209 100644
--- a/hosts/architect/sunshine.nix
+++ b/hosts/architect/sunshine.nix
@@ -48,7 +48,7 @@ in
       nvidiaSettings = true;
     };
   };
-
+  systemd.services.NetworkManager-wait-online.enable = pkgs.lib.mkForce false;
   programs.steam = {
     enable = true;
     gamescopeSession.enable = true;
@@ -114,22 +114,21 @@ in
       };
     };
 
-    displayManager = {
-      sddm = {
-        enable = true;
-        wayland.enable = false;
-        autoLogin.relogin = true;
-      };
-      autoLogin = {
-        inherit user;
-        enable = true;
-      };
-    };
-
     xserver = {
       enable = true;
       videoDrivers = [ "nvidia" ];
-      desktopManager.xfce.enable = true;
+      desktopManager.gnome.enable = true;
+      displayManager = {
+        gdm = {
+          enable = true;
+          autoSuspend = false;
+          autoLogin = {
+            inherit user;
+            enable = true;
+          };
+        };
+        defaultSession = "gnome-xorg";
+      };
 
       monitorSection = ''
         HorizSync       5.0 - 1000.0