Merged with old laptop dotfiles