xkb: add the demon king keyboard

diff --git a/xkb/shada.xkb b/xkb/shada.xkb
index 5f70d8d5d4f67e4fd076cfabe350768f95a6cd8f..71f38a1776638652e51a75fc68334cb67650758b 100644 (file)
--- a/xkb/shada.xkb
+++ b/xkb/shada.xkb
@@ -2,6 +2,6 @@ xkb_keymap {
     xkb_keycodes { include "evdev" };
     xkb_types    { include "complete" };
     xkb_compat   { include "complete" };
     xkb_keycodes { include "evdev" };
     xkb_types    { include "complete" };
     xkb_compat   { include "complete" };

-    xkb_symbols  { include "pc+inet(evdev)+dvorak+dvorak(applealu_iso)" };
-    xkb_geometry { include "macintosh(applealu_iso)" };
+    xkb_symbols  { include "pc+inet(evdev)+dvorak+dvorak(demon_king)" };
+    xkb_geometry { include "pc(pc104)" };

 };
 };

diff --git a/xkb/symbols/dvorak b/xkb/symbols/dvorak
index 4836766085616748b1d0ec670f8b1cd8e226bca0..2b87d889bf212be8879cb6479f4577b0c5995aa3 100644 (file)
--- a/xkb/symbols/dvorak
+++ b/xkb/symbols/dvorak
@@ -1,7 +1,7 @@
 default partial alphanumeric_keys modifier_keys
 xkb_symbols "default" { //{{{1
     // 1st Row {{{2
 default partial alphanumeric_keys modifier_keys
 xkb_symbols "default" { //{{{1
     // 1st Row {{{2

-    key <LSGT> { [            less,         greater,             bar,       brokenbar ] };
+    key <TLDE> { [           grave,      asciitilde,      dead_grave,      dead_tilde ] };

     key <AE01> { [          exclam,               1 ] };
     key <AE02> { [              at,               2,        EuroSign,        EuroSign ] };
     key <AE03> { [      numbersign,               3 ] };
     key <AE01> { [          exclam,               1 ] };
     key <AE02> { [              at,               2,        EuroSign,        EuroSign ] };
     key <AE03> { [      numbersign,               3 ] };


@@ -49,7 +49,6 @@ xkb_symbols "default" { //{{{1
 
     // 4th Row {{{2
     key <LFSH> { [         Shift_L ] };
 
     // 4th Row {{{2
     key <LFSH> { [         Shift_L ] };

-    key <TLDE> { [           grave,      asciitilde,      dead_grave,      dead_tilde ] };

     key <AB01> { [       semicolon,           colon,     dead_ogonek, dead_doubleacute ] };
     key <AB02> { [               q,               Q ] };
     key <AB03> { [               j,               J ] };
     key <AB01> { [       semicolon,           colon,     dead_ogonek, dead_doubleacute ] };
     key <AB02> { [               q,               Q ] };
     key <AB03> { [               j,               J ] };


@@ -153,6 +152,13 @@ xkb_symbols "applealu_iso" { //{{{1
     key <I233> { [   XF86MonBrightnessUp ] };
 }; //}}}1
 
     key <I233> { [   XF86MonBrightnessUp ] };
 }; //}}}1
 

+partial modifier_keys
+xkb_symbols "demon_king" { //{{{1
+    // Swap Keys {{{2
+    include "altwin(swap_alt_win)"
+    include "level3(rwin_switch)"
+}; //}}}1
+

 partial modifier_keys
 xkb_symbols "asus_zenbook" { //{{{1
     // Swap Keys {{{2
 partial modifier_keys
 xkb_symbols "asus_zenbook" { //{{{1
     // Swap Keys {{{2