dotfiles

commit f5002dfc95433276b4c729286193f00d5ccc1456
parent 5c2dbb527c95c2a028d49f6e170f4c919b24337a
Author: tongong <tongong@gmx.net>
Date:   Wed, 16 Jun 2021 15:36:23 +0200

added reload and folding to nvim config

Diffstat:
M
config/nvim/init.vim
 | 
39
+++++++++++++++++++++++++++++++++++----

1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
@@ -9,6 +9,9 @@ set shiftwidth=4
 set expandtab
 set smartindent
 
+set foldmethod=indent
+set foldlevelstart=20
+
 " interface
 set number
 set relativenumber
@@ -125,6 +128,7 @@ nnoremap <leader>w :w<CR>
 nnoremap <leader>r :Goyo<CR>
 nnoremap <leader>s :call ToggleSpell()<CR>
 nnoremap <leader>a ggVG
+nnoremap <leader>R :source $MYVIMRC<CR>
 " from LukeSmith's dotfiles
 " Compile document, be it groff/LaTeX/markdown/etc.
 nnoremap <leader>c :w! \| !compiler "<c-r>%"<CR>
@@ -137,6 +141,8 @@ nnoremap <leader>z :bo 10 Repl<CR>
 nnoremap Q gqq
 " the ^ key is not reachable on qwertz keyboards
 noremap 0 ^
+nmap <return> za
+nmap <leader><return> zR
 
 nmap <Leader>ii <Plug>(GitGutterPreviewHunk)
 nmap <Leader>is <Plug>(GitGutterStageHunk)
@@ -147,10 +153,27 @@ nmap <Leader>io <Plug>(GitGutterNextHunk)
 tnoremap <Esc> <Esc><C-\><C-n>
 
 " I always get these wrong
-command W w
-command Wq wq
-command WQ wq
-command Q q
+command! W w
+command! Wq wq
+command! WQ wq
+command! Q q
+
+noremap zj :call NextClosedFold('j')<cr>
+noremap zk :call NextClosedFold('k')<cr>
+
+function! NextClosedFold(dir)
+    let cmd = 'norm!z' . a:dir
+    let view = winsaveview()
+    let [l0, l, open] = [0, view.lnum, 1]
+    while l != l0 && open
+        exe cmd
+        let [l0, l] = [l, line('.')]
+        let open = foldclosed(l) < 0
+    endwhile
+    if open
+        call winrestview(view)
+    endif
+endfunction
 
 
 "###  AUTOCOMMANDS  ##########################################################
@@ -171,4 +194,12 @@ augroup SOME_NAME
     autocmd BufEnter * call InitToggleSpell()
     " do not keep history for pass
     autocmd BufEnter /dev/shm/* setl undofile&
+
+    " remember folding
+    autocmd BufWinLeave * mkview
+    autocmd BufWinEnter * silent! loadview
+    " Don't screw up folds when inserting text that might affect them, until
+    " leaving insert mode. Foldmethod is local to the window.
+    autocmd InsertEnter * let w:last_fdm=&foldmethod | setlocal foldmethod=manual
+    autocmd InsertLeave * let &l:foldmethod=w:last_fdm
 augroup END