From 6339a541fb99e6b5577e20a2b27814e1f2d725e1 Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Tue, 16 Nov 2021 00:09:37 -0700
Subject: Continue to try and eliminate bad keyboard keys

---
 jr           | 8 +++-----
 setxkbmap.sh | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/jr b/jr
index bc6da97..7034a9d 100644
--- a/jr
+++ b/jr
@@ -41,7 +41,7 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = []
   };
   key <CAPS> {
-    symbols[Group1] = [Control_L, Control_L, Home, Home, User, Pointer_EnableKeys, Delete, Delete],
+    symbols[Group1] = [Escape, Escape, Home, Home, User, Pointer_EnableKeys, Delete, Delete],
     symbols[Group2] = []
   };
   key <RTRN> {
@@ -334,13 +334,11 @@ xkb_symbols "jdvp" {
   };
   key <AE03> {
     symbols[Group1] = [ braceleft, 5, cent ],
-    symbols[Group2] = [ Up ],
-    actions[Group2] = [RedirectKey(Keycode=<UP>, modifiers=Control)]
+    symbols[Group2] = [ Up ]
   };
   key <AE04> {
     symbols[Group1] = [ braceright, 3, yen ],
-    symbols[Group2] = [ Down ],
-    actions[Group2] = [RedirectKey(Keycode=<DOWN>, modifiers=Control)]
+    symbols[Group2] = [ Down ]
   };
   key <AE05> {
     symbols[Group1] = [ parenleft, 1, EuroSign ],
diff --git a/setxkbmap.sh b/setxkbmap.sh
index 9e3696f..ddad73a 100755
--- a/setxkbmap.sh
+++ b/setxkbmap.sh
@@ -2,5 +2,5 @@
 
 setxkbmap -layout jr -variant jdvp -compat jrcompat -option numpad:mac
 killall xcape
-xcape -e 'Super_L=Tab;Control_L=Escape' -t 200
+xcape -e 'Super_L=Tab;Control_L=apostrophe' -t 200
 xset r rate 200 100
-- 
cgit