diff --git a/modules/gnome.nix b/modules/gnome.nix
index ad11ec5d..03cc3a02 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -3,17 +3,27 @@
 {
   services.xserver = {
     enable = true;
-    displayManager.lightdm.enable = false;
+
+    desktopManager = {
+      gnome.enable = true;
+    };
+
+    displayManager = {
+      gdm.enable = true;
+
+      autoLogin = {
+        enable = true;
+        user = "user";
+      };
+    };
+
     excludePackages = [ pkgs.xterm ];
   };
 
-  services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "user";
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
+  systemd.services = {
+    "getty@tty1".enable = false;
+    "autovt@tty1".enable = false;
+  };
 
   i18n.inputMethod = lib.mkForce {
     enabled = "ibus";
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 879cc7fa..05f2e6ff 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -19,7 +19,6 @@
 
   services.xserver = {
     enable = true;
-    displayManager.lightdm.enable = false;
     excludePackages = [ pkgs.xterm ];
   };
 }
diff --git a/modules/plasma.nix b/modules/plasma.nix
index e16e8e1a..ffe99093 100644
--- a/modules/plasma.nix
+++ b/modules/plasma.nix
@@ -3,17 +3,27 @@
 {
   services.xserver = {
     enable = true;
-    displayManager.lightdm.enable = false;
+
+    desktopManager = {
+      plasma5.enable = true;
+    };
+
+    displayManager = {
+      sddm.enable = true;
+
+      autoLogin = {
+        enable = true;
+        user = "user";
+      };
+    };
+
     excludePackages = [ pkgs.xterm ];
   };
 
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "user";
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
+  systemd.services = {
+    "getty@tty1".enable = false;
+    "autovt@tty1".enable = false;
+  };
 
   programs.hyprland.enable = lib.mkForce false;
   services.greetd.enable = lib.mkForce false;