diff --git a/jarvis/hardware-configuration.nix b/jarvis/hardware-configuration.nix
index 827fc38..30d451f 100644
--- a/jarvis/hardware-configuration.nix
+++ b/jarvis/hardware-configuration.nix
@@ -16,7 +16,7 @@
   hardware.cpu.intel.updateMicrocode = true;
 
 
-  services.xserver.synaptics.enable = true;
+  services.xserver.libinput.enable = true;
   services.thermald.enable = true;
 
   networking.wireless.enable = true;
diff --git a/roles/graphical.nix b/roles/graphical.nix
index 3902ec5..b6131b1 100644
--- a/roles/graphical.nix
+++ b/roles/graphical.nix
@@ -8,6 +8,10 @@
       horizontalScroll = true;
       scrollDelta = -107; # inverted scrolling
     };
+    libinput = {
+      naturalScrolling = true;
+      tappingDragLock = false;
+    };
     layout = "us";
     displayManager.slim.defaultUser = "yorick";
     # xkbOptions = "eurosign:e";