summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jr7
-rwxr-xr-xsetxkbmap.sh9
2 files changed, 10 insertions, 6 deletions
diff --git a/jr b/jr
index a03d6dc..48f74ab 100644
--- a/jr
+++ b/jr
@@ -9,8 +9,8 @@ xkb_symbols "josh-dvorak-intl" {
key.type = "EIGHT_LEVEL";
- modifier_map Mod3 { Hyper_L, ISO_Level5_Shift };
- modifier_map Mod4 { Super_L, ISO_Level5_Shift };
+ modifier_map Mod2 { ISO_Level5_Shift };
+ modifier_map Mod3 { Hyper_L };
modifier_map Mod5 { ISO_Level3_Shift };
key <LWIN> {
@@ -36,7 +36,8 @@ xkb_symbols "josh-dvorak-intl" {
symbols[Group1] = [Tab, ISO_Left_Tab]
};
key <RCTL> {
- symbols[Group1] = [Control_R, Control_R]
+ type[Group1] = "ONE_LEVEL",
+ symbols[Group1] = [ Control_R, Alt_R, Hyper_R ]
};
key <RALT> {
diff --git a/setxkbmap.sh b/setxkbmap.sh
index 1a58693..674056d 100755
--- a/setxkbmap.sh
+++ b/setxkbmap.sh
@@ -12,10 +12,13 @@ xmodmap <(echo '
# Remove Num_Lock, because Num_Lock is stupid and this allows
# us to potentially use mod2 for things!
- keycode 77 = NoSymbol
+ # keycode 77 = NoSymbol
# keycode 51 = Control_R
- remove control = Control_R
- add mod2 = Control_R
+ # remove control = Control_R
+ # add mod2 = Control_R
+
+ # ISO_Level5_Shift should be mapped to NumLock
+ remove mod3 = ISO_Level5_Shift
# keycode 222 = semicolon colon paragraph degree
# keycode 24 = Control_L