Improved my setup with Vim a bit.