diff --git a/roles/desktop-common/tasks/main.yml b/roles/desktop-common/tasks/main.yml
index 59358a4..2364d6d 100644
--- a/roles/desktop-common/tasks/main.yml
+++ b/roles/desktop-common/tasks/main.yml
@@ -27,6 +27,7 @@
       loop:
         - { src: "sshd_config", dest: "/etc/ssh/sshd_config", mode: "0644" }
         - { src: "nomouseaccel.conf", dest: "/etc/X11/xorg.conf.d/90-mouse-acceleration.conf", mode: "0644" }
+        - { src: "touchpad.conf", dest: "/etc/X11/xorg.conf.d/90-touchpad.conf", mode: "0644" }
         - { src: "i3.desktop", dest: "/usr/share/xsessions/i3-custom.desktop", mode: "0644" }
         - { src: "startx.desktop", dest: "/usr/share/xsessions/startx-custom.desktop", mode: "0644" }
     - name: Copy udev rules
diff --git a/roles/desktop-common/templates/nomouseaccel.conf b/roles/desktop-common/templates/nomouseaccel.conf
index 3887edb..6e4e89e 100644
--- a/roles/desktop-common/templates/nomouseaccel.conf
+++ b/roles/desktop-common/templates/nomouseaccel.conf
@@ -1,6 +1,9 @@
+# This file managed via Ansible
+# vim:ft=xf86conf
 Section "InputClass"
 	Identifier "mouse"
 	MatchIsPointer "yes"
+	# Options
 	Option "AccelProfile" "flat"
 	Option "AccelSpeed" "-1"
 EndSection
diff --git a/roles/desktop-common/templates/touchpad.conf b/roles/desktop-common/templates/touchpad.conf
new file mode 100644
index 0000000..1d6a174
--- /dev/null
+++ b/roles/desktop-common/templates/touchpad.conf
@@ -0,0 +1,12 @@
+# This file managed via Ansible
+# vim:ft=xf86conf
+Section "InputClass"
+	Identifier "touchpad"
+	MatchIsTouchpad "yes"
+	Driver "libinput"
+	# Options
+	Option "DisableWhileTyping" "yes"
+	Option "Tapping" "yes"
+	Option "TappingButtonMap" "lrm" # 1/2/3-finger taps
+	Option "TappingDrag" "yes"
+EndSection