This one seems to be a winner:

https://github.com/wrmsr/dotfiles/commit/a6597efe0421b6b0cc2...