Ask HN: How to build a robust personal archive

I want to consolidate my notes and text files that I run my life with. I am at a bit of a loss for how to set this system up. Here is my wishlist:

- Store a set of mainly text-based files, in total less than 100mb (annex for large files would be a nice bonus)

- Version control semantics

- Git/rsync style distributed architecture. Ideally I can sync to multiple filesystems like multiple personal computers, flashdrives, and generic file hosting like s3

- Merge semantics for conflicts between versions

- Encrypted at rest / in packed form, with simple password-based access. Low risk of losing data if I don’t lose the password. Reasonable degree of protection from everyone below state actors, even if the encrypted archive is exposed.

- Reasonably mature technologies that will likely be maintained for the next decade or two for all critical parts of the stack. Again, concerns about data loss are the most important thing here.

Should I just be using git with some kind of encryption wrapper around it? I’m happy using CLI tools here but very much don’t want to lose years of data because I screwed up a command at some point.