own mailserver, lots of improvements

[distro-setup] / input-setup

diff --git a/input-setup b/input-setup
index 1cd3f6f52803ae837885c9189291e630dadf204f..2f595f3e7cecbfca81570ead2f51bbe2b3ca1845 100755 (executable)
--- a/input-setup
+++ b/input-setup
@@ -1,4 +1,18 @@
 #!/bin/bash -l
+# Copyright (C) 2016 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #set -x
 mi() {
     xinput --get-feedbacks "$1" | grep "threshold"
@@ -22,9 +36,9 @@ set_device_id() {
 }
 
 case $HOSTNAME in
-       tp)
-               # original saved with: xkbcomp $DISPLAY /a/c/stretch-9-2016.xkb
-               xkbcomp /a/c/tp.xkb $DISPLAY
+       tp|x2)
+               # original saved with: xkbcomp $DISPLAY /a/c/stretch-11-2016.xkb
+               xkbcomp /a/c/x2.xkb $DISPLAY
                ;;
     treetowl*|iank-dev|frodo)
         # todo, differentiate for work pc
@@ -39,6 +53,7 @@ case $HOSTNAME in
             xkbset exp =m  # stop mousekeys expiring after a timeout
 
             xset r rate 200 13 # decrease rate delay
+            cd / # so xbindkeys does not hold open mountpoints
             xbindkeys # configured to grab left and right scroll button presses
         fi
 
@@ -75,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*)
         ;;