summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-24 11:04:17 +0200
committermakefu <github@syntax-fehler.de>2015-08-24 11:04:17 +0200
commite1e8b63fc3fee5db003feb2cde926e85076d34a3 (patch)
tree51f9768da76e867476ea440f70649bfb987aa81d
parentdce1ad91445297ecc122f968a12339438eabaa63 (diff)
makefu/x200: fix issue broken vlc, wheel on middle click
-rw-r--r--makefu/2configs/tp-x200.nix7
-rw-r--r--makefu/2configs/tp-x220.nix3
-rw-r--r--makefu/2configs/tp-x2x0.nix7
3 files changed, 11 insertions, 6 deletions
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index aed6d6448..ed46875d8 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -11,4 +11,11 @@ with lib;
};
services.thinkfan.enable = true;
+
+ # only works on tp-x200 , not x220
+ services.xserver.displayManager.sessionCommands = ''
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+ '';
}
diff --git a/makefu/2configs/tp-x220.nix b/makefu/2configs/tp-x220.nix
index d079d5b37..1aacb07cd 100644
--- a/makefu/2configs/tp-x220.nix
+++ b/makefu/2configs/tp-x220.nix
@@ -6,6 +6,9 @@ with lib;
imports = [ ./tp-x2x0.nix ];
boot.kernelModules = [ "kvm-intel" ];
+
+ services.xserver.vaapiDrivers = [pkgs.vaapiIntel pkgs.vaapiVdpau ];
+
services.xserver.displayManager.sessionCommands =''
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
diff --git a/makefu/2configs/tp-x2x0.nix b/makefu/2configs/tp-x2x0.nix
index e65563014..b79d94b4a 100644
--- a/makefu/2configs/tp-x2x0.nix
+++ b/makefu/2configs/tp-x2x0.nix
@@ -2,7 +2,7 @@
with lib;
{
- # TODO: pot this somewhere else
+ # TODO: put this somewhere else
networking.wireless.enable = true;
hardware.enableAllFirmware = true;
@@ -14,11 +14,6 @@ with lib;
hardware.trackpoint.enable = true;
hardware.trackpoint.sensitivity = 220;
hardware.trackpoint.speed = 220;
- services.xserver.displayManager.sessionCommands = ''
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
- '';
services.tlp.enable = true;
services.tlp.extraConfig = ''