diff --git a/modules/system/greetd.nix b/modules/system/greetd.nix
index de3b6cc..2958926 100644
--- a/modules/system/greetd.nix
+++ b/modules/system/greetd.nix
@@ -8,4 +8,9 @@
       };
     };
   };
+
+  services.xserver = {
+    autorun = false;
+    displayManager.startx.enable = true;
+  };
 }
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index e9c81de..5f951e3 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -24,11 +24,7 @@
   };
   services.xserver = {
     enable = true;
-    autorun = false;
-    displayManager = {
-      lightdm.enable = lib.mkForce false;
-      startx.enable = true;
-    };
+    displayManager.lightdm.enable = lib.mkForce false;
     desktopManager.xterm.enable = false;
   };
 }