diff --git a/modules/de/i3.nix b/modules/de/i3.nix
index 3a32ca2..65705b5 100644
--- a/modules/de/i3.nix
+++ b/modules/de/i3.nix
@@ -5,6 +5,7 @@
   programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
   # X11
   services.xserver = {
+    enable = true;
     xkb = {
       layout = "us";
       variant = "";
@@ -17,7 +18,6 @@
         enableXfwm = false;
       };
     };
-    libinput.enable = true;
     windowManager.i3 = {
       enable = true;
       extraPackages = with pkgs; [
diff --git a/modules/de/kde.nix b/modules/de/kde.nix
index 167d857..eddd375 100644
--- a/modules/de/kde.nix
+++ b/modules/de/kde.nix
@@ -4,6 +4,5 @@
   services = {
     desktopManager.plasma6.enable = true;
     displayManager.plasma-login-manager.enable = true;
-    xserver.enable = true;
   };
 }
\ No newline at end of file
diff --git a/modules/sys/hw/libinput.nix b/modules/sys/hw/libinput.nix
index f0eab29..7f01b16 100644
--- a/modules/sys/hw/libinput.nix
+++ b/modules/sys/hw/libinput.nix
@@ -1,4 +1,8 @@
+{pkgs, ...}:
+
 {
-  services.libinput.enable = true;
-  
+  services = {
+    libinput.enable = true;
+    xserver.modules = [ pkgs.xf86-input-libinput ]
+  };
 }
\ No newline at end of file