diff --git a/configuration.nix b/configuration.nix
index ac7298f..0b2ed72 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -37,7 +37,20 @@ in
   i18n.defaultLocale = "en_CA.UTF-8";
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  services.xserver = {
+    enable = true;
+    videoDrivers = [ "radeon" ];
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+
+    # Enable the LXQT Desktop Environment.
+    displayManager = {
+      lightdm.enable = true;
+      lxqt.enable = true;
+    };
+  };
 
   # Printer Stuff (FUCK HP!)
   services = {
@@ -53,16 +66,6 @@ in
     };
   };
 
-  # Enable the LXQT Desktop Environment.
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.lxqt.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    xkb.layout = "us";
-    xkb.variant = "";
-  };
-
   # Enable sound with pipewire.
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -94,12 +97,9 @@ in
 #  services.openwebrx.enable = true;
 
   # Enable automatic login for the user.
-  services = {
-    xserver.videoDrivers = [ "radeon" ];
-    displayManager.autoLogin = {
-      enable = true;
-      user = "freecorn";
-    };
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "freecorn";
   };
 
   # NGINX :3