X-Git-Url: https://git.madduck.net/etc/xsession.git/blobdiff_plain/4c7068183f08a6d7153a6ac85bc9221deb49b449..f433a87905bb289b15f19244722cbb0e104c6fdf:/.xsession.d/01-xkb

diff --git a/.xsession.d/01-xkb b/.xsession.d/01-xkb
index 7ff8667..740395f 100644
--- a/.xsession.d/01-xkb
+++ b/.xsession.d/01-xkb
@@ -1,5 +1,14 @@
 # load the keyboard definitions
-# DISABLED in favour of 01-xmodmap for now, until
-# http://lists.freedesktop.org/archives/xorg/2008-June/036340.html
-# is answered
-#xkbcomp $HOME/.xkb ${DISPLAY%%.*}
+
+XKBDIR="$HOME/.xkb"
+#XKBMAPFILE="$XKBDIR/keymap/${(%):-%M}"
+XKBMAPFILE="$XKBDIR/keymap/$(hostname --fqdn)"
+[[ -r "$XKBMAPFILE" ]] || XKBMAPFILE="${XKBMAPFILE%/*}/default"
+
+info "loading keymap from $XKBMAPFILE"
+
+xkbcomp -I"$XKBDIR" "$XKBMAPFILE" "${DISPLAY%%.*}"
+
+unset XKBDIR XKBMAPFILE
+
+# vim:ft=zsh