From a80f46a525e753883ad457572fb7388d9236fd20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Wed, 9 Dec 2020 00:54:03 +0100 Subject: [PATCH] Make touchpad config machine-dependent --- _machines/tb-hak.yml | 1 + autostart/autostart.sh | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml index 1c98ce8..75ac186 100644 --- a/_machines/tb-hak.yml +++ b/_machines/tb-hak.yml @@ -51,3 +51,4 @@ environment: MACHINE_HAS_KEEPASSX: "true" MACHINE_HAS_RESTIC_BACKUP: "true" MACHINE_HAS_SPOTIFY: "true" + MACHINE_HAS_TOUCHPAD: "true" diff --git a/autostart/autostart.sh b/autostart/autostart.sh index 8e4b9ac..e5f1139 100755 --- a/autostart/autostart.sh +++ b/autostart/autostart.sh @@ -106,18 +106,18 @@ run_oneshot_multiple keyboard \ "setxkbmap -layout $keyboard_layout -variant $keyboard_variant" \ "xset r rate $keyboard_repeat_delay $keyboard_repeat_speed" -run_oneshot_multiple touchpad \ - "synclient VertEdgeScroll=0" \ - "synclient VertTwoFingerScroll=1" \ - "synclient MaxSpeed=2.2" \ - "synclient AccelFactor=0.08" \ - "synclient TapButton1=1" \ - "synclient CoastingSpeed=0" \ - "synclient PalmDetect=1" \ - "synclient PalmMinWidth=20" \ - "synclient PalmMinZ=180" - -run_oneshot pulseaudio start-pulseaudio-x11 --start --daemonize=false --fail=true --log-target=stderr +if [[ "${MACHINE_HAS_TOUCHPAD}" == "true" ]] ; then + run_oneshot_multiple touchpad \ + "synclient VertEdgeScroll=0" \ + "synclient VertTwoFingerScroll=1" \ + "synclient MaxSpeed=2.2" \ + "synclient AccelFactor=0.08" \ + "synclient TapButton1=1" \ + "synclient CoastingSpeed=0" \ + "synclient PalmDetect=1" \ + "synclient PalmMinWidth=20" \ + "synclient PalmMinZ=180" +fi run gpg-agent gpg-agent --homedir "$HOME/.gnupg" --no-detach --daemon