[dotancohen]

org-mode and Git.

I've tried so many systems over the past two and a half decades. I only picked up org-mode last year, for the decade before that it was Markdown in VIM... I absolutely live in VIM.

I love having just plain text files, not a day goes by that I'm not grepping or finding or seding or occasionally even awking through them. I moved from Markdown to org-mode for the collapsible sections, like an outliner. Yes, there are some VIM addons that can do collapsing, but honestly org-mode does it better and I can slowly add other nice org-mode features as I need them. I do have Evil installed, though. The only thing Emacs really is missing out of the box is a decent text editor. ))

[icedata]

ditto. Using git takes the worry out of using it, gives you a granular restoration process. I've only needed it once in the last year, but it was worth it. I use plain emacs.