From f7d08783b9b806a11edbc6b644da792bfbe29d75 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Wed, 27 Oct 2021 14:35:20 +0200
Subject: Address :Gstatus deprecation

---
 vim/.vimrc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'vim/.vimrc')

diff --git a/vim/.vimrc b/vim/.vimrc
index d88bb1c..124f8ae 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -95,7 +95,7 @@ nnoremap <a-f> :Files<cr>
 nnoremap <a-g> :GitFiles<cr>
 
 " Fugitive
-nnoremap <Leader>gs :Gstatus<cr>
+nnoremap <Leader>gs :Git<cr>
 nnoremap <Leader>gc :Gcommit<cr>
 nnoremap <Leader>gr :Gread<cr>
 nnoremap <Leader>gd :Gdiff<cr>
@@ -132,7 +132,7 @@ if &runtimepath =~ 'remembrall'
         autocmd FileType tex nnoremap <buffer> <silent> <expr> ,l Remembrall(',l')
     augroup END
 endif
-let g:remembrall_suffixes = [""]
+let g:remembrall_suffixes = []
 let g:ripple_winpos = "vertical"
 let g:ripple_term_name = "term: ripple"
 nmap ,w <Plug>(ripple_send_motion)iw:Ripple <c-v><cr><cr>
@@ -173,7 +173,9 @@ let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsListSnippets="<c-l>"
 
 " Vimtex
-let g:vimtex_fold_enabled=1  " Makes %s slow!
+let g:vimtex_fold_manual=1
+let g:vimtex_fold_enabled=1
+let g:vimtex_fold_bib_enabled=1
 let g:vimtex_view_method='zathura'
 let g:vimtex_quickfix_mode=2
 let g:vimtex_compiler_progname='nvr'
@@ -215,6 +217,8 @@ augroup latex
     autocmd!
     autocmd FileType tex let b:surround_124 = "\\lvert \r \\rvert"
     autocmd FileType tex let b:surround_110 = "\\lVert \r \\rVert"
+    autocmd FileType tex let b:surround_101 = "\\begin{\1environment: \1}\r\\end{\1\1}"
+    autocmd FileType tex let b:surround_99 = "\\\1command\1{\r}"
 augroup END
 
 "" Vim options {{{1
@@ -259,7 +263,7 @@ if !has("nvim")
   set encoding=utf-8
 endif
 if has("nvim")
-  set inccommand=split
+  set inccommand=""
 endif
 
 "" Mappings {{{1
-- 
cgit v1.2.3