Another weekend spent refactoring my dotfiles for no reason at all...