From 6e61d6f1142171f602108486a3e15ba1951fde14 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Fri, 21 Jun 2024 22:58:12 +0200
Subject: [PATCH] chore: move displayManager, libinput from:  ->

---
 modules/core/wayland.nix | 16 +++++++++++++++-
 modules/core/xserver.nix | 14 ++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/core/wayland.nix b/modules/core/wayland.nix
index b92798f..f186ab9 100644
--- a/modules/core/wayland.nix
+++ b/modules/core/wayland.nix
@@ -1,5 +1,19 @@
-{ pkgs, ... }:
+{ username, pkgs, ... }:
 {
+  services = {
+    displayManager.autoLogin = {
+      enable = true;
+      user = "${username}";
+    };
+    libinput = {
+      enable = true;
+      # mouse = {
+      #   accelProfile = "flat";
+      # };
+    };
+  };
+
+
   programs.hyprland.enable = true;
   xdg.portal = {
     enable = true;
diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix
index 8a9b751..5b970e8 100644
--- a/modules/core/xserver.nix
+++ b/modules/core/xserver.nix
@@ -5,18 +5,8 @@
       enable = true;
       xkb.layout = "us";
     };
-
-    displayManager.autoLogin = {
-      enable = true;
-      user = "${username}";
-    };
-    libinput = {
-      enable = true;
-      # mouse = {
-      #   accelProfile = "flat";
-      # };
-    };
   };
-  # To prevent getting stuck at shutdown
+
+  # To prevent getting stuck at shutdown - this is not Xorg related, but I like to blame Xorg for all of my life issues.
   systemd.extraConfig = "DefaultTimeoutStopSec=10s";
 }