Improve idempotency, prep for dotfiles