nvim: replace delimitmate with mini.pairs

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 658f7ce2a3c49ca99dcfb38ffd77e85640fc6c31..db6f710be1c263ad726dda08d6c3463ff718a471 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -48,7 +48,12 @@ Plug 'klen/python-mode'
 Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'

-Plug 'raimondi/delimitmate'
+if !has('nvim')
+  Plug 'raimondi/delimitmate' " {{{2
+  let delimitMate_expand_cr = 2
+  let g:delimitMate_expand_space = 1
+  "}}}
+end

 Plug 'sgeb/vim-diff-fold'
 Plug 'skywind3000/asyncrun.vim' " {{{2
 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
 Plug 'sgeb/vim-diff-fold'
 Plug 'skywind3000/asyncrun.vim' " {{{2
 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>


@@ -676,9 +681,6 @@ nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
 nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
 nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
 
 nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
 nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
 

-" delimitmate {{{2
-let delimitMate_expand_cr = 2
-let g:delimitMate_expand_space = 1

 
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
 
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>


@@ -701,8 +703,11 @@ function! GitToggle()
   if buflisted(l:status_buffer)
     execute 'bdelete '.l:status_buffer
   else
   if buflisted(l:status_buffer)
     execute 'bdelete '.l:status_buffer
   else

-    Git
-    16wincmd_
+    execute 'Git'
+    if !empty(FugitiveGitDir())
+      " only resize status if Git was sucessful
+      16wincmd_
+    endif

   endif
 endfunction
 command! GitToggle :call GitToggle()
   endif
 endfunction
 command! GitToggle :call GitToggle()


@@ -969,8 +974,6 @@ function! SwitchSpell()
 endfunction
 
 nnoremap <silent> coS :call SwitchSpell()<CR>
 endfunction
 
 nnoremap <silent> coS :call SwitchSpell()<CR>

-" fix spelling with first choice
-nnoremap <Leader>f 1z=

 
 " gitdir or home {{{2
 " from derek wyatt:
 
 " gitdir or home {{{2
 " from derek wyatt: