From 126b5b9ddc21571e5beb7f63b3fab21cd3fa9aab Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Thu, 1 Feb 2024 23:32:55 -0700
Subject: fix some more stuff

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

diff --git a/jr b/jr
index 72cf909..df9a638 100644
--- a/jr
+++ b/jr
@@ -9,9 +9,9 @@ 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 };
+  modifier_map Mod3 { Hyper_L, ISO_Level5_Shift };
+  modifier_map Mod4 { Super_L, ISO_Level5_Shift };
+  modifier_map Mod5 { ISO_Level3_Shift };
 
   key <ESC> {
     symbols = [NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol,
@@ -51,7 +51,7 @@ xkb_symbols "josh-dvorak-intl" {
     symbols[Group1] = [Tab, ISO_Left_Tab]
   };
   key <RCTL> {
-    symbols[Group1] = [Hyper_L, Hyper_L]
+    symbols[Group1] = [Control_R, Control_R]
   };
 
   key <RALT> {
diff --git a/setxkbmap.sh b/setxkbmap.sh
index af403d0..978f593 100755
--- a/setxkbmap.sh
+++ b/setxkbmap.sh
@@ -9,7 +9,11 @@ xmodmap <(echo '
   keycode 23 = Hyper_L
   remove mod4 = Hyper_L
   add mod3 = Hyper_L
-')
+
+  # keycode 222 = semicolon colon paragraph degree
+  # keycode 24 = Control_L
+  # add Control = Control_L
+' | sed '/^\s*#/d')
 
 xcape -e 'Hyper_L=Tab' -t 400
 xset r rate 200 100
-- 
cgit