Clean up some more bindings.

Have tab remap to hyper in the setxbmap script because it's pretty
useless unless xcape is running. I'd rather the default behavior be tab
acting like tab.

Add to the script the ability for caps lock to act as both escape and
control. I think I like it. It's still a test run.

1 files changed, 9 insertions, 10 deletions

diff --git a/jr b/jr
index f45a738..72cf909 100644
--- a/jr
+++ b/jr
@@ -48,7 +48,7 @@ xkb_symbols "josh-dvorak-intl" {
   };
   key <TAB> {
     type[Group1] = "TWO_LEVEL",
-    symbols[Group1] = [Hyper_L, ISO_Left_Tab]
+    symbols[Group1] = [Tab, ISO_Left_Tab]
   };
   key <RCTL> {
     symbols[Group1] = [Hyper_L, Hyper_L]
@@ -227,21 +227,20 @@ xkb_symbols "josh-dvorak-intl" {
   };
 
   key <DOWN> {
-    symbols[Group1] = [Down, U2193, U21D3]
+    type[Group1] = "ONE_LEVEL",
+    symbols[Group1] = [Down]
   };
   key <UP> {
-    symbols[Group1] = [Up, U2191, U21D1]
+    type[Group1] = "ONE_LEVEL",
+    symbols[Group1] = [Up]
   };
   key <LEFT> {
-    symbols[Group1] = [Left, U2190, U21D0]
+    type[Group1] = "ONE_LEVEL",
+    symbols[Group1] = [Left]
   };
   key <RGHT> {
-    symbols[Group1] = [Right, U2192, U21D2]
-  };
-
-  // A random key none of my keyboards have. Map it to tab so I can use xcape.
-  key <JPCM> {
-    symbols[Group1] = [Tab]
+    type[Group1] = "ONE_LEVEL",
+    symbols[Group1] = [Right]
   };
 };