]> git.rmz.io Git - dotfiles.git/commitdiff
fuck Xmodmap
authorSamir Benmendil <samir.benmendil@gmail.com>
Mon, 20 Jan 2014 14:27:10 +0000 (15:27 +0100)
committerSamir Benmendil <samir.benmendil@gmail.com>
Wed, 29 Jan 2014 18:03:30 +0000 (19:03 +0100)
Makefile
Xmodmap [deleted file]
xkb/shada.xkb [new file with mode: 0644]
xkb/symbols/dvorak [new file with mode: 0644]
xprofile

index df882948c5851ab0bde84ce779ac95aab26259b5..c9c01e45f08fe129291546e651da4967592a9b64 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 APATH := $(realpath .)
 
 FILES := bin
 APATH := $(realpath .)
 
 FILES := bin
-DOTFILES := aliases bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* vim* weechat xbindkeysrc Xmodmap Xresources xprofile zsh*
-CONFIGFILES := retroarch compton.conf mimeo.conf mpd
+DOTFILES := aliases bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* vim* weechat xbindkeysrc Xresources xprofile zsh*
+CONFIGFILES := compton.conf mimeo.conf mpd retroarch xkb
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)
diff --git a/Xmodmap b/Xmodmap
deleted file mode 100644 (file)
index d0b700a..0000000
--- a/Xmodmap
+++ /dev/null
@@ -1,45 +0,0 @@
-! switch numbers/special chars
-keycode 10 = exclam      1
-keycode 11 = at          2 at          2 EuroSign        EuroSign
-keycode 12 = numbersign  3
-keycode 13 = dollar      4
-keycode 14 = percent     5
-keycode 15 = asciicircum 6 asciicircum 6 dead_circumflex dead_circumflex
-keycode 16 = ampersand   7
-keycode 17 = asterisk    8
-keycode 18 = parenleft   9
-keycode 19 = parenright  0
-
-keycode 31 = c C c C ccedilla   Ccedilla
-keycode 38 = a A a A adiaeresis Adiaeresis
-keycode 39 = o O o O odiaeresis Odiaeresis
-keycode 40 = e E e E EuroSign   EuroSign
-keycode 41 = u U u U udiaeresis Udiaeresis
-keycode 47 = s S s S ssharp     ssharp
-
-! Adds the F13-F19 keys
-keycode 191 = F13
-keycode 192 = F14
-keycode 193 = F15
-keycode 194 = F16
-keycode 195 = F17
-keycode 196 = F18
-keycode 197 = F19
-
-! Since I'am unable to create new key-names, existing ones
-! have to be used. To see all names xmodmap accepts, run:
-! sudo dumpkeys -l
-
-! Expose key: fn+F3
-keycode 128 = F23
-! Dashboard: fn+F4
-keycode 212 = F24
-
-! remap Caps_Lock as Escape
-clear Lock
-keycode 66 = Escape NoSymbol Escape
-
-! Alt_R as 3rd level chooser
-keycode 108 = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift
-clear Mod1
-add Mod1 = Alt_L
diff --git a/xkb/shada.xkb b/xkb/shada.xkb
new file mode 100644 (file)
index 0000000..5f70d8d
--- /dev/null
@@ -0,0 +1,7 @@
+xkb_keymap {
+    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)" };
+};
diff --git a/xkb/symbols/dvorak b/xkb/symbols/dvorak
new file mode 100644 (file)
index 0000000..4db8504
--- /dev/null
@@ -0,0 +1,153 @@
+default partial alphanumeric_keys modifier_keys
+xkb_symbols "default" { //{{{1
+    // 1st Row {{{2
+    key <LSGT> { [            less,         greater,             bar,       brokenbar ] };
+    key <AE01> { [          exclam,               1 ] };
+    key <AE02> { [              at,               2,        EuroSign,        EuroSign ] };
+    key <AE03> { [      numbersign,               3 ] };
+    key <AE04> { [          dollar,               4 ] };
+    key <AE05> { [         percent,               5 ] };
+    key <AE06> { [     asciicircum,               6, dead_circumflex, dead_circumflex ] };
+    key <AE07> { [       ampersand,               7 ] };
+    key <AE08> { [        asterisk,               8 ] };
+    key <AE09> { [       parenleft,               9,      dead_grave,        NoSymbol ] };
+    key <AE10> { [      parenright,               0 ] };
+    key <AE11> { [     bracketleft,       braceleft ] };
+    key <AE12> { [    bracketright,      braceright,      dead_tilde,        NoSymbol ] };
+    key <BKSP> { [       BackSpace,       BackSpace ] };
+
+    // 2nd Row {{{2
+    key  <TAB> { [             Tab,    ISO_Left_Tab ] };
+    key <AD01> { [      apostrophe,        quotedbl,      dead_acute,  dead_diaeresis ] };
+    key <AD02> { [           comma,            less,    dead_cedilla,      dead_caron ] };
+    key <AD03> { [          period,         greater,   dead_abovedot,  periodcentered ] };
+    key <AD04> { [               p,               P ] };
+    key <AD05> { [               y,               Y ] };
+    key <AD06> { [               f,               F ] };
+    key <AD07> { [               g,               G ] };
+    key <AD08> { [               c,               C,        ccedilla,        Ccedilla ] };
+    key <AD09> { [               r,               R ] };
+    key <AD10> { [               l,               L ] };
+    key <AD11> { [           slash,        question ] };
+    key <AD12> { [           equal,            plus ] };
+
+    // 3rd Row {{{2
+    key <CAPS> { [          Escape ] };
+    key <AC01> { [               a,               A,      adiaeresis,      Adiaeresis ] };
+    key <AC02> { [               o,               O,      odiaeresis,      Odiaeresis ] };
+    key <AC03> { [               e,               E,        EuroSign,        EuroSign ] };
+    key <AC04> { [               u,               U,      udiaeresis,      Udiaeresis ] };
+    key <AC05> { [               i,               I,      idiaeresis,      Idiaeresis ] };
+    key <AC06> { [               d,               D ] };
+    key <AC07> { [               h,               H ] };
+    key <AC08> { [               t,               T ] };
+    key <AC09> { [               n,               N ] };
+    key <AC10> { [               s,               S,          ssharp,          ssharp ] };
+    key <AC11> { [           minus,      underscore ] };
+    key <BKSL> { [       backslash,             bar ] };
+    key <RTRN> { [          Return ] };
+
+    // 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 <AB04> { [               k,               K ] };
+    key <AB05> { [               x,               X ] };
+    key <AB06> { [               b,               B ] };
+    key <AB07> { [               m,               M ] };
+    key <AB08> { [               w,               W ] };
+    key <AB09> { [               v,               V ] };
+    key <AB10> { [               z,               Z ] };
+    key <RTSH> { [         Shift_R ] };
+
+    // 5th Row {{{2
+    key <LCTL> { [        Control_L ] };
+    key <LALT> { [            Alt_L ] };
+    key <LWIN> { [          Super_L ] };
+    key <SPCE> { [            space ] };
+    key <RWIN> { [          Super_R ] };
+    key <RCTL> { [        Control_R ] };
+    key <RALT> { [ ISO_Level3_Shift ] };
+
+    // F Keys {{{2
+    key <ESC>  { [          Escape ] };
+    key <FK01> { [              F1,              F1,              F1,              F1,  XF86Switch_VT_1 ] };
+    key <FK02> { [              F2,              F2,              F2,              F2,  XF86Switch_VT_2 ] };
+    key <FK03> { [              F3,              F3,              F3,              F3,  XF86Switch_VT_3 ] };
+    key <FK04> { [              F4,              F4,              F4,              F4,  XF86Switch_VT_4 ] };
+    key <FK05> { [              F5,              F5,              F5,              F5,  XF86Switch_VT_5 ] };
+    key <FK06> { [              F6,              F6,              F6,              F6,  XF86Switch_VT_6 ] };
+    key <FK07> { [              F7,              F7,              F7,              F7,  XF86Switch_VT_7 ] };
+    key <FK08> { [              F8,              F8,              F8,              F8,  XF86Switch_VT_8 ] };
+    key <FK09> { [              F9,              F9,              F9,              F9,  XF86Switch_VT_9 ] };
+    key <FK10> { [             F10,             F10,             F10,             F10,  XF86Switch_VT_10 ] };
+    key <FK11> { [             F11,             F11 ] };
+    key <FK12> { [             F12,             F12 ] };
+
+    // Numpad {{{2
+    key <NMLK> { [        Num_Lock ] };
+    key <KPEQ> { [        KP_Equal ] };
+    key <KPDV> { [       KP_Divide,       KP_Divide ] };
+    key <KPMU> { [     KP_Multiply,     KP_Multiply ] };
+
+    key  <KP7> { [         KP_Home,            KP_7 ] };
+    key  <KP8> { [           KP_Up,            KP_8 ] };
+    key  <KP9> { [        KP_Prior,            KP_9 ] };
+    key <KPSU> { [     KP_Subtract,     KP_Subtract ] };
+
+    key  <KP4> { [         KP_Left,            KP_4 ] };
+    key  <KP5> { [        KP_Begin,            KP_5 ] };
+    key  <KP6> { [        KP_Right,            KP_6 ] };
+    key <KPAD> { [          KP_Add,          KP_Add ] };
+
+    key  <KP1> { [          KP_End,            KP_1 ] };
+    key  <KP2> { [         KP_Down,            KP_2 ] };
+    key  <KP3> { [         KP_Next,            KP_3 ] };
+
+    key  <KP0> { [       KP_Insert,            KP_0 ] };
+    key <KPDL> { [       KP_Delete,      KP_Decimal ] };
+    key <KPEN> { [        KP_Enter ] };
+
+    // Navigation {{{2
+    key <HOME> { [            Home ] };
+    key <PGUP> { [           Prior ] };
+    key  <END> { [             End ] };
+    key <PGDN> { [            Next ] };
+    key <DELE> { [          Delete ] };
+
+    // Arrows {{{2
+    key <DOWN> { [            Down ] };
+    key   <UP> { [              Up ] };
+    key <LEFT> { [            Left ] };
+    key <RGHT> { [           Right ] };
+
+    // Level3_Shift {{{2
+    include "level3(ralt_switch)"
+}; //}}}1
+
+partial
+xkb_symbols "applealu_iso" { //{{{1
+    // F Keys {{{2
+    key <I169> { [       XF86Eject ] };
+
+    key <FK13> { [             F13 ] };
+    key <FK14> { [             F14 ] };
+    key <FK15> { [             F15 ] };
+    key <FK16> { [             F16 ] };
+    key <FK17> { [             F17 ] };
+    key <FK18> { [             F18 ] };
+    key <FK19> { [             F19 ] };
+
+    // Multimedia {{{2
+    key <MUTE> { [         XF86AudioMute ] };
+    key <VOL-> { [  XF86AudioLowerVolume ] };
+    key <VOL+> { [  XF86AudioRaiseVolume ] };
+    key <I171> { [         XF86AudioNext ] };
+    key <I172> { [         XF86AudioPlay,  XF86AudioPause ] };
+    key <I173> { [         XF86AudioPrev ] };
+    key <I215> { [         XF86AudioPlay ] };
+    key <I232> { [ XF86MonBrightnessDown ] };
+    key <I233> { [   XF86MonBrightnessUp ] };
+}; //}}}1
index 7eb8f3894e5e3e40d8edc732787b7dcc78229f4d..d70f69fd49eb6468591683ba5f0e87e79bdd0d91 100644 (file)
--- a/xprofile
+++ b/xprofile
@@ -1,6 +1,6 @@
 start-pulseaudio-x11
 compton -b --config ~/.config/compton.conf
 xautolock -time 10 -locker "i3lock -n -c 000000" -detectsleep &
 start-pulseaudio-x11
 compton -b --config ~/.config/compton.conf
 xautolock -time 10 -locker "i3lock -n -c 000000" -detectsleep &
-xmodmap ~/.Xmodmap
+xkbcomp -I$HOME/.config/xkb $HOME/.config/xkb/$HOST.xkb $DISPLAY
 xbindkeys
 urxvtd -q -f -o
 xbindkeys
 urxvtd -q -f -o