refactor all the things based on @holman's dotfiles