From fb10426999d92dc7fa23bd171f55cf6df7aece62 Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Sun, 17 Dec 2023 10:48:09 -0600
Subject: [PATCH] Cleaned up xserver config

---
 hosts/NixDawn/configuration.nix | 39 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/hosts/NixDawn/configuration.nix b/hosts/NixDawn/configuration.nix
index 5254e73..4171e80 100644
--- a/hosts/NixDawn/configuration.nix
+++ b/hosts/NixDawn/configuration.nix
@@ -15,20 +15,35 @@ in
       ./hardware-configuration.nix
     ];
   networking.hostName = "NixDawn"; # Define your hostname.
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
 
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
+  services.xserver = {
+    # Enable the X11 windowing system.
+    enable = true;
+    exportConfiguration = true;
+
+    # Configure keymap in X11
+    layout = "us";
+    xkbVariant = "";
+
+    libinput = {
+      enable = true;
+      touchpad = {
+        naturalScrolling = true;
+      };
+    };
+
+    # Enable the KDE Plasma Desktop Environment.
+    displayManager.sddm.enable = true;
+
+    windowManager.exwm = {
+      enable = true;
+      enableDefaultConfig = false;
+    };
+  };
 
   programs.nm-applet.enable = true;
   services.picom.enable = true;
 
-  services.xserver.windowManager.exwm = {
-    enable = true;
-    enableDefaultConfig = false;
-  };
-
   services.pcscd.enable = true;
   programs.gnupg.agent = {
     enable = true;
@@ -50,12 +65,6 @@ in
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
 
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "";
-  };
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.benson = {
     isNormalUser = true;