xorg cleanup

nixosConfigurations/gerg-desktop/main.nix

@@ -9,11 +9,7 @@
 {
   local = {
     DE.dwm.enable = true;
-    DM = {
+    DM.lightdm.enable = true;
-      lightdm.enable = true;
-      autoLogin = true;
-      loginUser = "gerg";
-    };
     theming = {
       enable = true;
       kmscon.enable = true;
@@ -114,7 +110,10 @@
     '';
   };
 
-  services.libinput.mouse.accelProfile = "flat";
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "gerg";
+  };
 
   programs = {
     steam.enable = true;

nixosConfigurations/media-laptop/main.nix

@@ -7,11 +7,7 @@
 {
   local = {
     remoteBuild.enable = true;
-    DM = {
+    DM.lightdm.enable = true;
-      lightdm.enable = true;
-      autoLogin = true;
-      loginUser = "media";
-    };
     DE.xfce.enable = true;
     theming = {
       enable = true;
@@ -35,6 +31,10 @@
 
   sops.secrets.root.neededForUsers = true;
 
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "media";
+  };
   users = {
     mutableUsers = false;
     users = {

nixosModules/DE/dwm.nix

@@ -38,62 +38,9 @@
       sxhkd = {
         wantedBy = [ "graphical-session.target" ];
         partOf = [ "graphical-session.target" ];
-        serviceConfig = {
+        serviceConfig =
-          ExecStart = "${lib.getExe pkgs.sxhkd} -c /etc/sxhkd/sxhkdrc";
+          let
-          Restart = "always";
+            configFile = pkgs.writeText "sxhkdrc" ''
-          RestartSec = 2;
-          ExecReload = "pkill -usr1 -x $MAINPID";
-        };
-      };
-
-      picom = {
-        wantedBy = [ "graphical-session.target" ];
-        partOf = [ "graphical-session.target" ];
-        serviceConfig = {
-          ExecStart = "${lib.getExe pkgs.picom} --backend egl";
-          Restart = "always";
-          RestartSec = 2;
-          ExecReload = "pkill -usr1 -x $MAINPID";
-        };
-      };
-    };
-    services = {
-      gvfs.enable = true;
-      displayManager.defaultSession = "none+dwm";
-      xserver = {
-        enable = true;
-        displayManager = {
-          sessionCommands = ''
-            feh --bg-center "${self'.packages.images}/recursion.png"
-            numlockx
-          '';
-        };
-        windowManager.session = [
-          {
-            name = "dwm";
-            start = ''
-              update_time () {
-                while :
-                do
-                  sleep 1
-                  xsetroot -name "$(date +"%I:%M %p")"
-                done
-              }
-
-              dont_stop() {
-                while type dwm >/dev/null ; do dwm && continue || break ; done
-              }
-
-              update_time &
-              dont_stop &
-              waitPID=$!
-            '';
-          }
-        ];
-      };
-    };
-
-    environment.etc."sxhkd/sxhkdrc".text = ''
               XF86AudioPlay
                 playerctl play-pause
               XF86AudioPause
@@ -123,5 +70,54 @@
               super + ctrl + l
                 xsecurelock
             '';
+          in
+
+          {
+            ExecStart = "${lib.getExe pkgs.sxhkd} -c '${configFile}'";
+            Restart = "always";
+            RestartSec = 2;
+            ExecReload = "pkill -usr1 -x $MAINPID";
+          };
+      };
+
+      picom = {
+        wantedBy = [ "graphical-session.target" ];
+        partOf = [ "graphical-session.target" ];
+        serviceConfig.ExecStart = "${lib.getExe pkgs.picom} --backend egl";
+      };
+    };
+    services = {
+      displayManager.defaultSession = "none+dwm";
+      xserver = {
+        enable = true;
+        displayManager.sessionCommands = ''
+          feh --bg-center "${self'.packages.images}/recursion.png"
+          numlockx
+        '';
+        windowManager.session = [
+          {
+            name = "dwm";
+            start = ''
+              update_time () {
+                while :
+                do
+                  sleep 1
+                  xsetroot -name "$(date +"%I:%M %p")"
+                done
+              }
+
+              dont_stop() {
+                while type dwm >/dev/null ; do dwm && continue || break ; done
+              }
+
+              update_time &
+              dont_stop &
+              waitPID=$!
+            '';
+          }
+        ];
+      };
+    };
+
   };
 }

nixosModules/DE/xfce.nix

@@ -8,14 +8,12 @@
 
   config = lib.mkIf config.local.DE.xfce.enable {
     environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
-    services = {
+    services.xserver = {
-      xserver = {
       enable = true;
       desktopManager.xfce = {
         enable = true;
         enableScreensaver = true;
       };
-      };
       displayManager.defaultSession = "xfce";
     };
   };

nixosModules/DM/autoLogin.nix

@@ -1,19 +0,0 @@
-{ config, lib }:
-{
-  options.local.DM = {
-    autoLogin = lib.mkEnableOption "";
-    loginUser = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-    };
-  };
-
-  config = lib.mkIf config.local.DM.autoLogin {
-    services.displayManager = {
-      autoLogin = {
-        enable = true;
-        user = config.local.DM.loginUser;
-      };
-    };
-  };
-}

nixosModules/DM/lightDM.nix

@@ -14,7 +14,7 @@
         extraConfig = "minimum-vt=1";
         greeters.mini = {
           enable = true;
-          user = config.local.DM.loginUser;
+          inherit (config.services.displayManager.autoLogin) user;
           extraConfig = ''
             [greeter]
             show-password-label = false

nixosModules/X11.nix

@@ -1,5 +1,6 @@
 { pkgs, lib }:
 {
+  services.libinput.mouse.accelProfile = "flat";
   services.xserver = {
     tty = lib.mkDefault 1;
     exportConfiguration = true;