From c573dcd5527c6fee2fa3b9b58f3a1be4a51ef5bb Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Fri, 26 Jan 2024 15:24:42 -0700
Subject: Switch back to using mod4 as the main key with XMonad. Using the
 hyper key is too much work.

---
 jr           | 23 +++++++++++------------
 setxkbmap.sh |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/jr b/jr
index 2bbfc3d..d50ed55 100644
--- a/jr
+++ b/jr
@@ -31,7 +31,10 @@ xkb_symbols "josh-dvorak-intl" {
     type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level3_Shift]
   };
   key <LCTL> {
-    type[Group1] = "ONE_LEVEL", symbols[Group1] = [Hyper_L]
+    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,26 +49,22 @@ xkb_symbols "josh-dvorak-intl" {
     symbols[Group1] = [Super_L, ISO_Left_Tab]
   };
   key <RCTL> {
-    symbols[Group1] = [Super_L, Super_L]
+    symbols[Group1] = [Hyper_L, Hyper_L]
   };
 
-  modifier_map Mod4 {<RCTL>, <TAB>};
+  modifier_map Mod3 {<RCTL>, <TAB>, <RTSH>};
 
-  modifier_map Mod3 {<LCTL>};
+  modifier_map Mod4 {<LCTL>};
 
   key <RALT> {
     type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level3_Shift]
   };
   modifier_map Mod5 {<RALT>};
 
-  key <RTSH> {
-    type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift]
-  };
-  // I have no idea what's going on. Without this line, X11 appears to
-  // interpret right shift as if it was also a hyper key? This isn't right. I
-  // think this probably interprets it as a super key, but idk, it appears to
-  // solve some of this problem though this is a gross hack.
-  modifier_map Mod4 {<RTSH>};
+  // key <RTSH> {
+  //   symbols[Group1] = type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift]
+  // };
+  // modifier_map Lock {<RTSH> };
 
   // Set Menu and PrintScreen to Hyper.
   key <MENU> {
diff --git a/setxkbmap.sh b/setxkbmap.sh
index 4c4ca8e..907f0c8 100755
--- a/setxkbmap.sh
+++ b/setxkbmap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-setxkbmap -layout jr -variant jdvp -option numpad:mac
+setxkbmap -layout jr -variant jdvprk -option numpad:mac
 killall xcape
 xcape -e 'Super_L=Tab' -t 200
 xset r rate 200 100
-- 
cgit