From 6d7dfe8dddc8c88e213c13ea08e3cf3be4985c12 Mon Sep 17 00:00:00 2001
From: Patrick Neff <odie86@gmail.com>
Date: Sun, 14 Apr 2024 15:48:04 +0200
Subject: [PATCH] fix displayManager deprecation

---
 modules/nixos/desktop/xorg/default.nix | 38 ++++++++++++++------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/modules/nixos/desktop/xorg/default.nix b/modules/nixos/desktop/xorg/default.nix
index 155be73..19ce1c5 100644
--- a/modules/nixos/desktop/xorg/default.nix
+++ b/modules/nixos/desktop/xorg/default.nix
@@ -9,9 +9,8 @@
     ./i18n.nix
   ];
 
-  config = {
-    services.xserver = lib.mkIf config.desktop.enable {
-      enable = true;
+  config = lib.mkIf config.desktop.enable {
+    services = {
       displayManager = {
         sddm.enable = true;
         autoLogin = {
@@ -20,24 +19,27 @@
         };
         defaultSession = "none+awesome";
       };
-      windowManager.awesome = {
+      xserver = {
         enable = true;
-        luaModules = with pkgs.luaPackages; [
-          luarocks
-          vicious
-        ];
-      };
-      libinput = {
-        enable = true;
-
-        # disabling mouse acceleration
-        mouse = {
-          accelProfile = "flat";
+        windowManager.awesome = {
+          enable = true;
+          luaModules = with pkgs.luaPackages; [
+            luarocks
+            vicious
+          ];
         };
+        libinput = {
+          enable = true;
 
-        # disabling touchpad acceleration
-        touchpad = {
-          accelProfile = "flat";
+          # disabling mouse acceleration
+          mouse = {
+            accelProfile = "flat";
+          };
+
+          # disabling touchpad acceleration
+          touchpad = {
+            accelProfile = "flat";
+          };
         };
       };
     };