From e6b10b1ed4f7be44727ff4d7e3023de9220ccae9 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Sat, 26 May 2018 11:31:09 -0400
Subject: icd

---
 bin/icd | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/icd b/bin/icd
index 86a01c1..637697f 100755
--- a/bin/icd
+++ b/bin/icd
@@ -39,6 +39,7 @@ KIN_USB_ID=$(lsusb | grep -i "Kinesis Advantage Pro" | awk '{ print $6 }')
 ERG_USB_ID=$(lsusb | grep -i "feed:1307" | awk '{ print $6 }')
 SUN_USB_ID=$(lsusb | grep -i "Sun Microsystems, Inc. Type 6 Keyboard" | awk '{ print $6 }')
 
+echo "Setting up laptop"
 setxkbmap ${LAPTOP_OPTIONS} -device ${LAPTOP_ID} -print > ${XKB_DIR}/keymap/icd.laptop
 #xkbcomp -I${HOME}/.xkb -synch \
 xkbcomp -I${HOME}/.xkb -i ${LAPTOP_ID} -synch \
@@ -84,7 +85,7 @@ fi
 echo ${ERG_USB_ID}
 if [ "x${ERG_USB_ID}" != "x" ]; then
     echo "Setting up ergodox"
-    ERG_XINPUT_ID=$(xinput | grep "ErgoDox EZ" | sed -e 's/.*id=\([0-9]\+\).*/\1/g')
+    ERG_XINPUT_ID=$(xinput | grep "ErgoDox EZ" | grep keyboard | sed -e 's/.*id=\([0-9]\+\).*/\1/g')
     echo "ID: ${ERG_XINPUT_ID}"
     for XID in $ERG_XINPUT_ID; do
         echo $XID
@@ -93,7 +94,9 @@ if [ "x${ERG_USB_ID}" != "x" ]; then
             -device ${XID} \
             ${ERG_OPTIONS} \
             -print > ${HOME}/.xkb/keymap/icd.erg
-        xkbcomp -I${HOME}/.xkb -i ${XID} -synch \
+            # -print | sed -e 's@+group(shifts_toggle)@+ctrl(nocaps)&@g' > ${HOME}/.xkb/keymap/icd.erg
+        # xkbcomp -I${HOME}/.xkb -i ${XID} -synch \
+        xkbcomp -I${HOME}/.xkb -synch \
             ${HOME}/.xkb/keymap/icd.erg ${DISPLAY} # 2> /dev/null
     done
 fi
-- 
cgit v1.2.3