Link to your dotfiles?
I ended up moving to yadm and I’ve been very happy. I pretty much just maintain the bootstrap script and I version all my other dotfiles accordingly.
I haven’t really needed alternate files or encryption but I’m glad they’re in there already.