diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix
index 00f3c3a..cb80001 100644
--- a/lenovo/thinkpad/general.nix
+++ b/lenovo/thinkpad/general.nix
@@ -5,20 +5,7 @@ let
 in
 
 {
-  hardware.trackpoint = mkDefault {
-    enable = true;
-    emulateWheel = true;
-  };
-
-  hardware.enableRedistributableFirmware = mkDefault true;
-  services.tlp.enable = true;
-
-  services.xserver = mkDefault {
-    synaptics.enable = false;
-    libinput.enable = true;
-  };
-
-  environment.systemPackages = [ pkgs.acpi ];
-
-  sound.enableMediaKeys = mkDefault true;
+  hardware.trackpoint.enable = mkDefault true;
+  services.tlp.enable = mkDefault true;
+  services.xserver.libinput.enable = mkDefault true;
 }