diff --git a/readme.org b/readme.org index e037ae0..fea2dd3 100644 --- a/readme.org +++ b/readme.org @@ -5,57 +5,57 @@ * Keybindings ** General -| Key | Mode | Action | -|-----------------+--------+-------------------------------------| -| == | - | Leader key | -| =cd= | Normal | Open netrw file explorer | -| =rl= | Normal | Reload vimrc | -| == | Normal | Source current file | -| == | Insert | Behave like == | -| =Q= | Normal | Disabled (no Ex mode) | +| Mode | Key | Action | +|--------+-----------------+-------------------------------------| +| - | == | Leader key | +| Normal | =cd= | Open netrw file explorer | +| Normal | =rl= | Reload vimrc | +| Normal | == | Source current file | +| Insert | == | Behave like == | +| Normal | =Q= | Disabled (no Ex mode) | ** Editing -| Key | Mode | Action | -|--------------+--------+----------------------------------------| -| =J= | Visual | Move selected lines down | -| =K= | Visual | Move selected lines up | -| =J= | Normal | Join lines with cursor preserved | -| =p= | Visual | Paste without overwriting clipboard | -| =d= | Normal/Visual | Delete without overwriting clipboard | -| =s= | Normal | Substitute word under cursor on line | -| =x= | Normal | Make current file executable | -| =dg= | Normal | Generate documentation (Doge) | +| Mode | Key | Action | +|---------------+--------------+----------------------------------------| +| Visual | =J= | Move selected lines down | +| Visual | =K= | Move selected lines up | +| Normal | =J= | Join lines with cursor preserved | +| Visual | =p= | Paste without overwriting clipboard | +| Normal/Visual | =d= | Delete without overwriting clipboard | +| Normal | =s= | Substitute word under cursor on line | +| Normal | =x= | Make current file executable | +| Normal | =dg= | Generate documentation (Doge) | ** Navigation -| Key | Mode | Action | -|--------------+--------+----------------------------------| -| == | Normal | Scroll half-page down and center | -| == | Normal | Scroll half-page up and center | -| =n= | Normal | Next search result (centered) | -| =N= | Normal | Previous search result (centered)| -| == | Normal | Next location list item | -| == | Normal | Previous location list item | -| =k= | Normal | Next location list (centered) | -| =j= | Normal | Previous location list (centered)| -| =cl= | Normal | Close location list | +| Mode | Key | Action | +|--------+--------------+----------------------------------| +| Normal | == | Scroll half-page down and center | +| Normal | == | Scroll half-page up and center | +| Normal | =n= | Next search result (centered) | +| Normal | =N= | Previous search result (centered)| +| Normal | == | Next location list item | +| Normal | == | Previous location list item | +| Normal | =k= | Next location list (centered) | +| Normal | =j= | Previous location list (centered)| +| Normal | =cl= | Close location list | ** FZF -| Key | Mode | Action | -|--------------+--------+-------------------------------------| -| =ff= | Normal | Find files | -| =fo= | Normal | File history | -| =fb= | Normal | Open buffers | -| =fq= | Normal | Quickfix list | -| =fh= | Normal | Help tags | -| =fs= | Normal | Grep current word under cursor | -| =fg= | Normal | Grep (prompt for input) | -| =fc= | Normal | Grep for current filename | -| =fi= | Normal | Find files in =~/.vim= config | +| Mode | Key | Action | +|--------+--------------+-------------------------------------| +| Normal | =ff= | Find files | +| Normal | =fo= | File history | +| Normal | =fb= | Open buffers | +| Normal | =fq= | Quickfix list | +| Normal | =fh= | Help tags | +| Normal | =fs= | Grep current word under cursor | +| Normal | =fg= | Grep (prompt for input) | +| Normal | =fc= | Grep for current filename | +| Normal | =fi= | Find files in =~/.vim= config | ** Clipboard (OSCYank) -| Key | Mode | Action | -|-------------+---------------+---------------------------| -| =y= | Normal/Visual | Yank via OSCYank | +| Mode | Key | Action | +|---------------+-------------+---------------------------| +| Normal/Visual | =y= | Yank via OSCYank | * Dependencies @@ -73,10 +73,24 @@ ** Installation -*** macOS +*** Arch Linux #+begin_src bash -brew install git vim ripgrep fd fzf -brew install rust-analyzer # optional +sudo pacman -S git vim ripgrep fd fzf +sudo pacman -S rust-analyzer # optional +npm install -g typescript-language-server # optional +#+end_src + +*** NixOS +#+begin_src bash +nix-env -iA nixpkgs.git nixpkgs.vim nixpkgs.ripgrep nixpkgs.fd nixpkgs.fzf +nix-env -iA nixpkgs.rust-analyzer # optional +npm install -g typescript-language-server # optional +#+end_src + +*** Gentoo +#+begin_src bash +sudo emerge --ask dev-vcs/git app-editors/vim sys-apps/ripgrep sys-apps/fd app-shells/fzf +sudo emerge --ask dev-lang/rust-bin # for rust-analyzer npm install -g typescript-language-server # optional #+end_src @@ -86,6 +100,13 @@ sudo apt install git vim ripgrep fd-find fzf # Note: fd is called fd-find on Debian/Ubuntu #+end_src +*** macOS +#+begin_src bash +brew install git vim ripgrep fd fzf +brew install rust-analyzer # optional +npm install -g typescript-language-server # optional +#+end_src + *** Rust Analyzer #+begin_src bash rustup component add rust-analyzer