diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix
index 2351f53..9ba06f0 100644
--- a/modules/DE/dwm.nix
+++ b/modules/DE/dwm.nix
@@ -33,6 +33,8 @@
 
     services.gvfs.enable = true;
 
+    services.displayManager.defaultSession = "none+dwm";
+
     services.xserver = {
       enable = true;
       displayManager = {
@@ -42,7 +44,6 @@
           systemctl --user start sxhkd
           systemctl --user start picom
         '';
-        defaultSession = "none+dwm";
       };
       windowManager.session = [
         {
diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix
index 4d0e2de..16f756e 100644
--- a/modules/DE/gnome.nix
+++ b/modules/DE/gnome.nix
@@ -42,10 +42,12 @@ _:
       };
     };
 
-    services.xserver = {
-      enable = true;
-      desktopManager.gnome.enable = true;
+    services = {
       displayManager.defaultSession = "gnome";
+      xserver = {
+        enable = true;
+        desktopManager.gnome.enable = true;
+      };
     };
   };
   #_file
diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix
index c16f0dd..26d5d14 100644
--- a/modules/DE/xfce.nix
+++ b/modules/DE/xfce.nix
@@ -10,11 +10,13 @@ _:
 
   config = lib.mkIf config.local.DE.xfce.enable {
     environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
-    services.xserver = {
-      enable = true;
-      desktopManager.xfce = {
+    services = {
+      xserver = {
         enable = true;
-        enableScreensaver = true;
+        desktopManager.xfce = {
+          enable = true;
+          enableScreensaver = true;
+        };
       };
       displayManager.defaultSession = "xfce";
     };
diff --git a/modules/DM/autoLogin.nix b/modules/DM/autoLogin.nix
index 637cf45..c17f8d0 100644
--- a/modules/DM/autoLogin.nix
+++ b/modules/DM/autoLogin.nix
@@ -10,7 +10,7 @@ _:
   };
 
   config = lib.mkIf config.local.DM.autoLogin {
-    services.xserver.displayManager = {
+    services.displayManager = {
       autoLogin = {
         enable = true;
         user = config.local.DM.loginUser;
diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix
index f19c3fc..053a8a6 100644
--- a/modules/DM/lightDM.nix
+++ b/modules/DM/lightDM.nix
@@ -4,41 +4,39 @@
   options.local.DM.lightdm.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.local.DM.lightdm.enable {
-    services.xserver = {
-      displayManager = {
-        lightdm = {
+    services.xserver.displayManager = {
+      lightdm = {
+        enable = true;
+        background = "${self.packages.images}/recursion.png";
+        extraConfig = "minimum-vt=1";
+        greeters.mini = {
           enable = true;
-          background = "${self.packages.images}/recursion.png";
-          extraConfig = "minimum-vt=1";
-          greeters.mini = {
-            enable = true;
-            user = config.local.DM.loginUser;
-            extraConfig = ''
-              [greeter]
-              show-password-label = false
-              password-label-text =
-              invalid-password-text =
-              show-input-cursor = false
-              password-alignment = center
-              password-input-width = 19
-              show-image-on-all-monitors = true
+          user = config.local.DM.loginUser;
+          extraConfig = ''
+            [greeter]
+            show-password-label = false
+            password-label-text =
+            invalid-password-text =
+            show-input-cursor = false
+            password-alignment = center
+            password-input-width = 19
+            show-image-on-all-monitors = true
 
 
-              [greeter-theme]
-              font = "OverpassMono Nerd Font"
-              font-size = 1.1em
-              text-color = "#7AA2F7"
-              error-color = "#DB4B4B"
-              background-color = "#000000"
-              window-color = "#000000"
-              border-color = "#000000"
-              password-character = -1
-              password-color = "#7AA2F7"
-              password-background-color = "#24283B"
-              password-border-color = "#000000"
-              password-border-radius = 0.341125em
-            '';
-          };
+            [greeter-theme]
+            font = "OverpassMono Nerd Font"
+            font-size = 1.1em
+            text-color = "#7AA2F7"
+            error-color = "#DB4B4B"
+            background-color = "#000000"
+            window-color = "#000000"
+            border-color = "#000000"
+            password-character = -1
+            password-color = "#7AA2F7"
+            password-background-color = "#24283B"
+            password-border-color = "#000000"
+            password-border-radius = 0.341125em
+          '';
         };
       };
     };