remove vestigas of failed vi mode.

2 files changed, 11 insertions, 17 deletions

diff --git a/jr b/jr
index 919d2cb..16aaed4 100644
--- a/jr
+++ b/jr
@@ -53,7 +53,7 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = []
   };
   key <TAB> {
-    symbols[Group1] = [Tab, ISO_Left_Tab],
+    symbols[Group1] = [Super_L, ISO_Left_Tab],
     symbols[Group2] = []
   };
   key <RCTL> {
@@ -61,7 +61,7 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = []
   };
 
-  modifier_map Mod4 {<RCTL>};
+  modifier_map Mod4 {<RCTL>, <TAB>};
 
   modifier_map Mod3 {<LCTL>};
 
@@ -78,13 +78,13 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
 
   // Set Menu and PrintScreen to Hyper.
   key <MENU> {
-    symbols = [Hyper_R],
-    actions = [SetMods(modifiers=Mod4)]
+    symbols = [Hyper_R, Hyper_R],
+    actions = [SetMods(modifiers=Mod3), SetMods(modifiers=Mod3)]
   };
 
   key <PRSC> {
-    symbols = [Hyper_R],
-    actions = [SetMods(modifiers=Mod4)]
+    symbols = [Hyper_R, Hyper_R],
+    actions = [SetMods(modifiers=Mod4), SetMods(modifiers=Mod3)]
   };
 
   key <TLDE> {
@@ -199,13 +199,8 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = [Pointer_Down, Pointer_Button5]
   };
   key <AC03> {
-    repeat = yes,
     symbols[Group1] = [e, E, eacute, Eacute, Greek_epsilon, Greek_EPSILON],
-    symbols[Group2] = [Right],
-    actions[Group2] = [
-      RedirectKey(Keycode=<RGHT>, modifiers=Control),
-      RedirectKey(Keycode=<RGHT>, modifiers=Control)
-    ]
+    symbols[Group2] = [Right]
   };
   key <AC04> {
     symbols[Group1] = [u, U, uacute, Uacute, Greek_theta, Greek_THETA],
@@ -265,12 +260,8 @@ default partial alphanumeric_keys xkb_symbols "josh-dvorak-intl" {
     symbols[Group2] = [Delete]
   };
   key <AB06> {
-    repeat = yes,
     symbols[Group1] = [b, B, Greek_beta, U2603, Greek_beta, Greek_BETA],
-    symbols[Group2] = [],
-    actions[Group2] = [
-        RedirectKey(Keycode=<LEFT>, modifiers=Control),
-        RedirectKey(Keycode=<LEFT>, modifiers=Control) ]
+    symbols[Group2] = []
   };
   key <AB07> {
     symbols[Group1] = [m, M, mu, mu, Greek_mu, Greek_MU],
diff --git a/setxkbmap.sh b/setxkbmap.sh
index 034a219..cd6fe30 100755
--- a/setxkbmap.sh
+++ b/setxkbmap.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 
 setxkbmap -layout jr -variant jdvp -compat jrcompat -option numpad:mac
+killall xcape
+xcape -e 'Super_L=Tab' -t 200
+xset r rate 200 100