[Linux] Setup Hyper/Use xkb instead of xmodmap

dotfiles/Xmodmap

@@ -1,5 +0,0 @@
-keycode 66 = Control_L
-clear Lock
-add Control = Control_L
-keycode 117 = Caps_Lock
-add Lock = Caps_Lock

dotfiles/lib/bin/load_xkb_map.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+XKBDIR="$HOME/.xkb"
+XKBMAPFILE="$XKBDIR/keymap/$(hostname --fqdn)"
+[[ -r "$XKBMAPFILE" ]] || XKBMAPFILE="${XKBMAPFILE%/*}/default"
+
+echo "loading keymap from $XKBMAPFILE"
+
+xkbcomp -I"$XKBDIR" "$XKBMAPFILE" "${DISPLAY%%.*}"
+
+unset XKBDIR XKBMAPFILE

dotfiles/xinitrc

@@ -1,5 +1,4 @@
 # -*- mode: sh -*-
-setxkbmap -layout "$(setxkbmap -print | awk -F + '/xkb_symbols/ {print $2}')" -option ctrl:nocaps
 xrdb -merge "$HOME/.Xresources"
 
 # Disable screensaver

dotfiles/xkb/keymap/default

@@ -0,0 +1,8 @@
+xkb_keymap {
+	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
+	xkb_types     { include "complete"	};
+	xkb_compat    { include "complete"	};
+	xkb_symbols   { include "pc+us+inet(evdev)+imalison(rwin_as_hyper)"	};
+	xkb_geometry  { include "pc(pc105)"	};
+};
+

dotfiles/xkb/symbols/hyper

@@ -0,0 +1,5 @@
+partial modifier_keys
+xkb_symbols "rwin" {
+    key <RWIN> { [ Hyper_R ] };
+    modifier_map Mod3 { <HYPR>, Hyper_R };
+};

dotfiles/xkb/symbols/imalison

@@ -0,0 +1,5 @@
+partial modifier_keys
+xkb_symbols "rwin_as_hyper" {
+    replace key <RWIN> { [ Hyper_L ] };
+    modifier_map Mod3 { <RWIN>, Hyper_L, Hyper_R };
+};

dotfiles/xprofile

@@ -1,2 +1,3 @@
 # -*- mode: sh; -*-
 source "$HOME/.lib/shellenv.sh"
+load_xkb_map.sh

tasks/arch.py

@@ -25,7 +25,7 @@ PACKAGES = [
     "android-sdk-platform-tools", "android-sdk", "keepassx-http", "global",
     "screencloud", "mopidy-spotify", "rcm", "xsettingsd-git", "aspell-en",
     "festival", "festival-freebsoft-utils", "hsetroot", "imwheel", "remmina",
-    "racket",
+    "racket", "xorg-utils",
 ]