From dab83792dbdb823fac085563eadf20260a31c70a Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 8 May 2021 20:23:57 +0200
Subject: [PATCH] config/nvim/keys: reorder mappings

---
 .config/nvim/init/keys.vim | 55 +++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/.config/nvim/init/keys.vim b/.config/nvim/init/keys.vim
index 4600efa..45fcde0 100644
--- a/.config/nvim/init/keys.vim
+++ b/.config/nvim/init/keys.vim
@@ -1,47 +1,49 @@
-let @c = '/^\n
i```Ni```j0/```
lllkxNA'
-
 " Save file as root when I forgot to use sudoedit
 cnoremap w!! execute 'write !sudo tee % >/dev/null' <bar> edit!
-" Write file & source vimrc (really only makes sense from within vimrc to quickly test changes)
+" Write file & source vimrc
+" For quickly testing changes while editing vimrc
 command! WS write <bar> source $MYVIMRC
 
 command! FormatJSON %!python -m json.tool
-command! DiffSwap :diffsp % " Diff for swap - replaced by 'chrisbra/Recover.vim'
-"command! for dictcc
+command! DiffSwap :diffsp % " Diff for swap - superseded by 'chrisbra/Recover.vim'
+
+" @c now takes an indented code block and surrounds it in backticks instead
+let @c = '/^\n
i```Ni```j0/```
lllkxNA'
 
 " Sane yanking
 map Y y$
 " Disable Ex mode - https://vi.stackexchange.com/q/457
 nnoremap Q @q
- 
-let mapleader=" "
 
-nmap <leader>" ysiW"
-
- " Alias write and quit to leader
-nnoremap <leader>q :wq<CR>
-nnoremap <leader>w :w<CR>
-
- " Easy split navigation
-nnoremap <C-J> <C-W><C-J>
-nnoremap <C-K> <C-W><C-K>
-nnoremap <C-L> <C-W><C-L>
-nnoremap <C-H> <C-W><C-H>
- " Shortcut split opening
-nnoremap <leader>h :split<Space>
-nnoremap <leader>v :vsplit<Space>
-
- " Alias replace all to S
+" Alias replace all to S
 nnoremap S :%s//gI<Left><Left><Left>
 
- " Jump around without shift
+" Jump around without shift
 nnoremap gl $
 nnoremap gh 0
 nnoremap gk H
 nnoremap gj L
 nnoremap gb G
+ 
+let mapleader=" "
 
- " Enable and disable auto comment
+" Shortcut for quoting current WORD
+nmap <leader>" ysiW"
+
+" Alias write and quit to leader
+nnoremap <leader>q :wq<CR>
+nnoremap <leader>w :w<CR>
+
+" Easy split navigation
+nnoremap <C-J> <C-W><C-J>
+nnoremap <C-K> <C-W><C-K>
+nnoremap <C-L> <C-W><C-L>
+nnoremap <C-H> <C-W><C-H>
+" Shortcut split opening
+nnoremap <leader>h :split<Space>
+nnoremap <leader>v :vsplit<Space>
+
+" Enable and disable auto comment
 map <leader>c :setlocal formatoptions-=cro<CR>
 map <leader>C :setlocal formatoptions=cro<CR>
 
@@ -51,7 +53,6 @@ map <leader>ls :setlocal colorcolumn=81,121 nowrap<CR>
 map <leader>lw :setlocal colorcolumn=81 textwidth=80<CR>
 map <leader>ln :setlocal colorcolumn= textwidth=0 wrap<CR>
 
+" Quickly switch indentation settings
 map <leader>t :setlocal shiftwidth=4 tabstop=4 noexpandtab<CR>
 map <leader>T :setlocal shiftwidth=2 expandtab<CR>
-
-" }}}