Merge independent repo conflink into this one

[distro-setup] / input-setup

diff --git a/input-setup b/input-setup
index 8ad80d315e9a1d73742078d87406b11ea4f2e99f..2f595f3e7cecbfca81570ead2f51bbe2b3ca1845 100755 (executable)
--- a/input-setup
+++ b/input-setup
@@ -37,7 +37,7 @@ set_device_id() {
 
 case $HOSTNAME in
        tp|x2)
-               # original saved with: xkbcomp $DISPLAY /a/c/stretch-x2-11-2016.xkb
+               # original saved with: xkbcomp $DISPLAY /a/c/stretch-11-2016.xkb
                xkbcomp /a/c/x2.xkb $DISPLAY
                ;;
     treetowl*|iank-dev|frodo)
@@ -90,7 +90,7 @@ case $HOSTNAME in
             # 12 is to effectively disable the middle click button
             xinput --set-button-map "$device_id" 1 12 3 10 11 6 7
         fi
-        /a/bin/bash_unpublished/gpg
+        . /a/bin/bash_unpublished/duplicity-gpg-agent-setup
         ;;
     frodo*)
         ;;