4 files changed, 37 insertions, 26 deletions
diff --git a/configs/desktop/x_server/.xsessionrc.device b/configs/desktop/x_server/.xsessionrc.device
new file mode 100644
index 000000000000..352dd4fb7d02
--- /dev/null
+++ b/configs/desktop/x_server/.xsessionrc.device
@@ -0,0 +1,5 @@
+# setup OSX style scrolling for desktop
+xinput --set-prop 'PixArt Lenovo USB Optical Mouse' 'libinput Natural Scrolling Enabled' 1
+
+# increase mouse speed
+xinput --set-prop 'PixArt Lenovo USB Optical Mouse' 'libinput Accel Speed' 1
diff --git a/configs/laptop/x_server/.xsessionrc.device b/configs/laptop/x_server/.xsessionrc.device
new file mode 100644
index 000000000000..83ee8caaca19
--- /dev/null
+++ b/configs/laptop/x_server/.xsessionrc.device
@@ -0,0 +1,8 @@
+# setup OSX style scrolling for laptop
+xinput --set-prop 'DLL07BF:01 06CB:7A13 Touchpad' 'libinput Natural Scrolling Enabled' 1
+
+# increase cursor speed
+xinput --set-prop 'DLL07BF:01 06CB:7A13 Touchpad' 'libinput Accel Speed' 1
+
+# disable touchscreen on laptop
+xinput disable 'ELAN Touchscreen'
diff --git a/configs/shared/x_server/.xsessionrc b/configs/shared/x_server/.xsessionrc
index 062293bf5a47..7f41552718fc 100644
--- a/configs/shared/x_server/.xsessionrc
+++ b/configs/shared/x_server/.xsessionrc
@@ -1,28 +1,4 @@
 #!/bin/sh
 
-source ~/.profile
-
-export DESKTOP_SESSION=cinnamon  # gnome for trusty.
-
-# NOTE: This may break your compose key.
-# See http://g/i3-users/YBexXGbik7E for more details.
-export GTK_IM_MODULE=xim
-
-# Desktop background color.
-xsetroot -solid "#333333"
-
-# start the urxvt daemon
-urxvtd -q -f -o
-
-# set kbds
-xmodmap -e 'remove Lock = Caps_Lock'
-xmodmap -e 'keysym Caps_Lock = Escape'
-
-# set key repeat preferences
-xset r rate 250 60
-
-# setup OSX style scrolling for gLinux Mouse
-xinput --set-prop 'PixArt Lenovo USB Optical Mouse' 'libinput Natural Scrolling Enabled' 1
-
-# increase mouse speed
-xinput --set-prop 'PixArt Lenovo USB Optical Mouse' 'libinput Accel Speed' 1
+source ~/.xsessionrc.shared
+source ~/.xsessionrc.device # desktop, laptop, cloudtop
diff --git a/configs/shared/x_server/.xsessionrc.shared b/configs/shared/x_server/.xsessionrc.shared
new file mode 100644
index 000000000000..996b57054010
--- /dev/null
+++ b/configs/shared/x_server/.xsessionrc.shared
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+source ~/.profile
+
+export DESKTOP_SESSION=cinnamon  # gnome for trusty.
+
+# NOTE: This may break your compose key.
+# See http://g/i3-users/YBexXGbik7E for more details.
+export GTK_IM_MODULE=xim
+
+# Desktop background color.
+xsetroot -solid "#333333"
+
+# start the urxvt daemon
+urxvtd -q -f -o
+
+# set kbds
+xmodmap -e 'remove Lock = Caps_Lock'
+xmodmap -e 'keysym Caps_Lock = Escape'
+
+# set key repeat preferences
+xset r rate 250 60