diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix
index 7a480fa..28a4210 100644
--- a/systems/x86_64-linux/drivebystation-nix/configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix
@@ -43,11 +43,35 @@
   };
 
   services = {
+    # Enable Gnome Session
+    desktopManager.gnome.enable = true;
+    displayManager.gdm.enable = false;
     displayManager.sddm.enable = true;
     displayManager.defaultSession = "gnome";
     desktopManager.plasma6.enable = true;
     xserver = {
       enable = true; # Enable the deprecated X11 teletype terminal connection system. 
+      
+      desktopManager = {
+        # Disable xterm
+        xterm.enable = false;
+        # Enable xfce session
+        xfce = {
+          enable = true;
+        };
+        # Disable fuckshit plasma
+      };
+      # Configure Display Manager
+      displayManager = {
+        # Enable lightdm
+        lightdm.enable = false;
+      };
+      # Configure keymap in X11
+      xkb = {
+        layout = "us";
+        variant = "intl";
+      };
+      
       # Specify first device section to use nvidia GPU
 
 
@@ -84,29 +108,6 @@
       #     Device "amdgpu"
       #   EndSection
       # '';
-
-      desktopManager = {
-        # Disable xterm
-        xterm.enable = false;
-        # Enable xfce session
-        xfce = {
-          enable = true;
-        };
-        # Enable Gnome Session
-        gnome.enable = true;
-        # Disable fuckshit plasma
-      };
-      # Configure Display Manager
-      displayManager = {
-        gdm.enable = false;
-        # Enable lightdm
-        lightdm.enable = false;
-      };
-      # Configure keymap in X11
-      xkb = {
-        layout = "us";
-        variant = "intl";
-      };
     };
   };
   # services.xserver.displayManager.defaultSession = "gnome-x11";  # services.xserver.displayManager.autoLogin.enable = true;
@@ -123,7 +124,7 @@
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;