dotfiles VS navi

diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...

The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].

[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...

Example: https://github.com/whiteinge/dotfiles/blob/master/bin/devdocs-local

Took me several years of forgetting script names before I finally just made a README of filenames and descriptions that I can search when I forget. I didn't want some complicated organization framework.

I ran a (mostly) vim-tmux-navigator setup for almost a year but ultimately removed it. It was indeed a seamless way to quickly jump between Vim and tmux panes but I felt it enabled learning some sloppy habits on my part.

I added filetype indent off so that indent plugins for the various languages would not automatically execute, and then I set smartindent so that regardless of what kind of file I'm editing it (very!) simply just re-uses the same indent from the previous line. For everything else I just manually ctrl-t/ctrl-d as I type.

I've built something similar for myself (fzf+a bit of shell). But I realized that fzf's history view (with very long history buffer) works much better for my use case.

I still needed something to cover rare commands with dynamic arguments. That got covered by Navi: https://github.com/denisidoro/navi (takes more friction to add new command than with TBMK, but you get much more organized and easier to search tool).

navi repo add denisidoro/navi-tldr-pages Cloning https://github.com/denisidoro/navi-tldr-pages into /home//.local/share/navi/cheats/tmp... Cloning into '/home//.local/share/navi/cheats/tmp'... remote: Enumerating objects: 1841, done. remote: Counting objects: 100% (1841/1841), done. remote: Compressing objects: 100% (1756/1756), done. remote: Total 1841 (delta 83), reused 1839 (delta 83), pack-reused 0 Receiving objects: 100% (1841/1841), 504.71 KiB | 1.95 MiB/s, done. Resolving deltas: 100% (83/83), done. Hey, listen! navi encountered a problem. Do you think this is a bug? File an issue at https://github.com/denisidoro/navi. Caused by: 0: Failed to import cheatsheets from `denisidoro/navi-tldr-pages` 1: Failed to get cheatsheet files from finder 2: Failed to pass data to finder 3: Unable to prompt cheats to import 4: Broken pipe (os error 32)

Similar projects (in a way): navi

I think navi is a better alternative. You can create custom cheats too.

navi might help you with that

I like using navi, but idk if you want something that runs in the terminal.

There's also a cli program called tealdeer that does this kind of thing and uses a local cache. And there's a fuzzy search interactive cli cheatsheet program called navi that's also pretty cool (and you can write your own cheatsheets).