Better xkb configuration I think

2 files changed, 10 insertions, 14 deletions

diff --git a/jr b/jr
index d50ed55..f45a738 100644
--- a/jr
+++ b/jr
@@ -9,6 +9,10 @@ xkb_symbols "josh-dvorak-intl" {
 
   key.type = "EIGHT_LEVEL";
 
+  modifier_map Mod3 { Hyper_L };
+  modifier_map Mod4 { Super_L };
+  modifier_map Mod5 { ISO_Level3_Shift, ISO_Level5_Shift };
+
   key <ESC> {
     symbols = [NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol,
     NoSymbol, NoSymbol],
@@ -33,9 +37,6 @@ xkb_symbols "josh-dvorak-intl" {
   key <LCTL> {
     type[Group1] = "ONE_LEVEL", symbols[Group1] = [Super_L]
   };
-  key <RTSH> {
-    symbols[Group1] = [ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift]
-  };
   key <CAPS> {
     symbols[Group1] = [Escape, Escape, Home, Home, User, Pointer_EnableKeys, Delete, Delete]
   };
@@ -46,25 +47,20 @@ xkb_symbols "josh-dvorak-intl" {
     symbols[Group1] = [BackSpace]
   };
   key <TAB> {
-    symbols[Group1] = [Super_L, ISO_Left_Tab]
+    type[Group1] = "TWO_LEVEL",
+    symbols[Group1] = [Hyper_L, ISO_Left_Tab]
   };
   key <RCTL> {
     symbols[Group1] = [Hyper_L, Hyper_L]
   };
 
-  modifier_map Mod3 {<RCTL>, <TAB>, <RTSH>};
-
-  modifier_map Mod4 {<LCTL>};
-
   key <RALT> {
     type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level3_Shift]
   };
-  modifier_map Mod5 {<RALT>};
 
-  // key <RTSH> {
-  //   symbols[Group1] = type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift]
-  // };
-  // modifier_map Lock {<RTSH> };
+  key <RTSH> {
+    symbols[Group1] = type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift]
+  };
 
   // Set Menu and PrintScreen to Hyper.
   key <MENU> {
diff --git a/setxkbmap.sh b/setxkbmap.sh
index 907f0c8..7595abf 100755
--- a/setxkbmap.sh
+++ b/setxkbmap.sh
@@ -2,5 +2,5 @@
 
 setxkbmap -layout jr -variant jdvprk -option numpad:mac
 killall xcape
-xcape -e 'Super_L=Tab' -t 200
+xcape -e 'Hyper_L=Tab' -t 200
 xset r rate 200 100