madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://"]
  insteadOf = madduck:

load xkb modifications from xsession
[etc/xsession.git] / .xsession.d / 01-xkb
index 7ff8667..1569982 100644 (file)
@@ -1,5 +1,41 @@
 # load the keyboard definitions
-# DISABLED in favour of 01-xmodmap for now, until
-# is answered
-#xkbcomp $HOME/.xkb ${DISPLAY%%.*}
+OPTS=(madduck:group2_intl madduck:caps_mod4)
+is_thinkpad() {
+  case "${(%):-%m}" in
+    lapse) return 0;;
+    *) return 1;;
+  esac
+load_keymap() {
+  local xkbdir; xkbdir=$HOME/.xkb
+  local model; model="$1"; shift
+  local layout; layout="$1"; shift
+  local args; args="-I -I$xkbdir -model $model -layout $layout -option"
+  args="$args -option ${(j: -option :)@}"
+  info "running setxkbmap with args: $args"
+  local tmpfile; tmpfile="$(tempfile -p kbmap)"
+  trap "rm -f $tmpfile" EXIT
+  eval setxkbmap $args -print >| "$tmpfile"
+  info keymap setting follows:
+  cat "$tmpfile" >&2
+  xkbcomp -I$HOME/.xkb "$tmpfile" ${DISPLAY%%.*}
+if is_thinkpad; then
+  info "loading keymap for thinkpad…"
+  load_keymap thinkpad us ${(z)OPTS}
+  info "loading pc104 keymap…"
+  load_keymap pc104 us ${(z)OPTS}
+unset OPTS
+unset LAYOUT
+# vim:ft=zsh