update keymaps

.config/X11/xkb/keymap/default

@@ -2,6 +2,6 @@ default xkb_keymap {
 	xkb_keycodes  { include "evdev+aliases(qwerty)" };
 	xkb_types     { include "complete" };
 	xkb_compat    { include "complete" };
-	xkb_symbols   { include "pc+us(dvorak)+inet(evdev)+capslock(super)+custom(ralt_mod3)+custom(group2_dvorak)" };
+	xkb_symbols   { include "pc+custom(dvorak)+inet(evdev)" };
 	xkb_geometry  { include "pc(pc105)" };
 };

.config/X11/xkb/symbols/custom

@@ -1,52 +1,19 @@
-// capslock as mod4
-partial modifier_keys
-xkb_symbols "caps_mod4" {
-    key <CAPS> { [ Super_L ] };
-    modifier_map Mod4 { <CAPS> };
-};
-
-// ralt as mod3
-partial modifier_keys
-xkb_symbols "ralt_mod3" {
-    include "group(switch)"
-    replace key <MENU> {
-        [ VoidSymbol, VoidSymbol ]
-    };
-    modifier_map Mod3 { <MENU> };
-};
-
-// group2 map for üöäß and some other things
 partial alphanumeric_keys
-xkb_symbols "group2_dvorak" {
-    key <AC01> { // A
-        symbols[Group2] = [ adiaeresis, Adiaeresis ]
-    };
-    key <AC02> { // O
-        symbols[Group2] = [ odiaeresis, Odiaeresis ]
-    };
-    key <AC04> { // U
-        symbols[Group2] = [ udiaeresis, Udiaeresis ]
-    };
-    key <AC10> { // S
-        symbols[Group2] = [ ssharp, ssharp ]
-    };
-    key <AB07> { // M
-        symbols[Group2] = [ mu, heart ]
-    };
-    key <TLDE> { // ~
-        symbols[Group2] = [ degree, infinity ]
-    };
-//     key <BKSP> {
-//         symbols[Group2] = [ BackSpace, BackSpace ]
-//     };
-//     key <SPCE> {
-//         symbols[Group2] = [ nobreakspace, nobreakspace ]
-//     };
-//     key <TAB> {
-//         symbols[Group2] = [ Tab, Tab ]
-//     };
-//     key <BKSP> {
-//         symbols[Group2] = [ BackSpace, BackSpace ]
-//     };
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+    name[Group1] = "English (Dvorak, Custom)";
+
+    key <TLDE>  { [grave,      asciitilde, degree                 ] };
+    key <AE04>  { [4,          dollar,     EuroSign               ] };
+
+    key <AC01>  { [a,          A,          adiaeresis, Adiaeresis ] };
+    key <AC02>  { [o,          O,          odiaeresis, Odiaeresis ] };
+    key <AC04>  { [u,          U,          udiaeresis, Udiaeresis ] };
+    key <AC10> { [s,          S,          ssharp                 ] };
+
+    key <BKSL>  { [ backslash, bar,        notsign,    brokenbar  ] };
+
+    include "level3(ralt_switch)"
+    include "capslock(super)"
 };
 

.local/bin/trash/remaps

@@ -27,12 +27,11 @@ else
 fi
 
 setxkbmap \
-    -layout "$(echo "$newgroup" | cut -d ':' -f1)" \
-    -variant "$(echo "$newgroup" | cut -d ':' -f2)" \
-    -option compose:ralt \
-    -option caps:super \
-    -option terminate:ctrl_alt_bksp 1>/dev/null 2>&1 ||
-    echo "Unkown keyboard layout" >&2
+	-layout "$(echo "$newgroup" | cut -d ':' -f1)" \
+	-variant "$(echo "$newgroup" | cut -d ':' -f2)" \
+	-option caps:super \
+	1>/dev/null 2>&1 ||
+	echo "Unkown keyboard layout" >&2
 
 xset r rate 300 50
 xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock