summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-09-10 14:38:21 +0200
committerAlan Pearce2017-09-10 14:38:21 +0200
commit45fcfe8435222078c2153f22b3f32d8bafb94633 (patch)
treebf1fe6a4e91a85f61c005004d700d99e8045d348
parentda93d42ee1b52155080fd5a46f33e96c7e8346d3 (diff)
downloadnixfiles-45fcfe8435222078c2153f22b3f32d8bafb94633.tar.lz
nixfiles-45fcfe8435222078c2153f22b3f32d8bafb94633.tar.zst
nixfiles-45fcfe8435222078c2153f22b3f32d8bafb94633.zip
x250: Use synaptics driver instead of libinput
-rw-r--r--modules/laptop.nix4
-rw-r--r--modules/synaptics.nix35
-rw-r--r--modules/x250.nix5
3 files changed, 25 insertions, 19 deletions
diff --git a/modules/laptop.nix b/modules/laptop.nix
index 3d6894cc..f0c88e7d 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 { boot.kernelModules = [ "coretemp" ];
   boot.extraModulePackages = with config.boot.kernelPackages; [
@@ -62,7 +62,7 @@
 
   services.xserver = {
     libinput = {
-      enable = true;
+      enable = lib.mkDefault true;
       naturalScrolling = true;
       disableWhileTyping = true;
     };
diff --git a/modules/synaptics.nix b/modules/synaptics.nix
index 0e9db17a..1028db35 100644
--- a/modules/synaptics.nix
+++ b/modules/synaptics.nix
@@ -1,24 +1,27 @@
 { config, pkgs, ... }:
 
-{ services.xserver.synaptics = {
-    enable = true;
+{ services.xserver = {
+    libinput.enable = false;
+    synaptics = {
+      enable = true;
 
-    accelFactor = "0.001";
+      accelFactor = "0.05";
 
-    minSpeed = "0.4";
-    maxSpeed = "2.0";
+      minSpeed = "0.2";
+      maxSpeed = "1.0";
 
-    palmDetect = true;
-    palmMinWidth = 5;
-    palmMinZ = 20;
+      palmDetect = true;
+      palmMinWidth = 5;
+      palmMinZ = 20;
 
-    twoFingerScroll = true;
-    vertTwoFingerScroll = true;
-    horizTwoFingerScroll = true;
-    additionalOptions = ''
-      Option "RBCornerButton" "3"
-      Option "VertScrollDelta" "-111"
-      Option "HorizScrollDelta" "-111"
-    '';
+      twoFingerScroll = true;
+      vertTwoFingerScroll = true;
+      horizTwoFingerScroll = true;
+      additionalOptions = ''
+        Option "RBCornerButton" "3"
+        Option "VertScrollDelta" "-111"
+        Option "HorizScrollDelta" "-111"
+      '';
+    };
   };
 }
diff --git a/modules/x250.nix b/modules/x250.nix
index 025bc302..a6509bf1 100644
--- a/modules/x250.nix
+++ b/modules/x250.nix
@@ -1,6 +1,9 @@
 { config, pkgs, ... }:
 
-{ boot.extraModulePackages = with config.boot.kernelPackages; [
+{ imports = [
+    ./synaptics.nix
+  ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [
     acpi_call
   ];