Just Use `git` to Manage Your Dotfiles

I switched to it after maintaining a custom written POSIX sh script that kept getting further and further out of hand.

I don't see myself going back to a self-maintained one unless I'm writing it in Rust.

You don't have to use vimdiff. You can use any merge tool you want. See https://www.chezmoi.io/user-guide/tools/merge/.

> Often my changes are speculative or experimental. So I checkout, edit, apply and only then discover I’ve messed up. Or I can edit in place. Voila vimdiff!

> What’s the better way?

There are lots of options. See https://www.chezmoi.io/user-guide/frequently-asked-questions....

Personally, I tend to use `chezmoi edit` and then use git in my source directory to `git add -p . && git commit` the changes I want to keep and `git checkout` to discard the changes I don't want.

The canonical workflow is this: you run chezmoi cd and make changes there first. Only then do you run chezmoi apply to propagate the changes to the original location.

The source of truth is always what lies in the chezmoi directory, not the other way around.

So if you’re experimenting with the dotfiles in their original location, running chezmoi apply will override them with the snapshot in the chezmoi directory. The vimdiff doesn’t do much here.

If you want to retain your changes there, you’ll have to manually copy them over to the chezmoi directory. This is a bit awkward, but having a consistent source of truth makes the behavior easier to reason about. I rarely look at the diff.