Still merging laptop dotfiles