nvim/ui: actually... don't show bufferline on single buffer

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index d94c7c23a259dbd0d8263cc109dc76976ff27b9b..665713258fa0de386dafbc6529e6d499c6bf8ff4 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -116,9 +116,42 @@ endif
 
 "}}}
 
 
 "}}}
 

-" snippets
-Plug 'sirver/ultisnips'
-Plug 'honza/vim-snippets'
+if !has("nvim")
+  Plug 'sirver/ultisnips' " {{{
+  Plug 'honza/vim-snippets'
+
+  let g:UltiSnipsEditSplit = 'vertical'
+  let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
+  if has('fname_case')
+    let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+  endif
+  let g:UltiSnipsExpandTrigger       = "<tab>"
+  let g:UltiSnipsJumpForwardTrigger  = "<tab>"
+  let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+  
+  " UltiSnips completion function that tries to expand a snippet. If there's no
+  " snippet for expanding, it checks for completion window and if it's shown,
+  " selects first element. If there's no completion window it tries to jump to
+  " next placeholder. If there's no placeholder it just returns TAB key
+  " https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
+  function! g:UltiSnips_Complete()
+      call UltiSnips#ExpandSnippet()
+      if g:ulti_expand_res == 0
+          if pumvisible()
+              return "\<C-n>"
+          else
+              call UltiSnips#JumpForwards()
+              if g:ulti_jump_forwards_res == 0
+                 return "\<TAB>"
+              endif
+          endif
+      endif
+      return ""
+  endfunction
+  au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
+  let g:UltiSnipsListSnippets="<c-e>"
+"}}}
+endif

 
 " text objects
 Plug 'kana/vim-textobj-user'
 
 " text objects
 Plug 'kana/vim-textobj-user'


@@ -204,8 +237,6 @@ set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=↪                 " show these chars for wrapped lines
 set breakindent                 " preserve indentation in wrapped text
 
 set showbreak=↪                 " show these chars for wrapped lines
 set breakindent                 " preserve indentation in wrapped text
 

-set lazyredraw                  " don't redraw while executing macros
-

 set list                        " show chars defined in 'listchars'
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 set list                        " show chars defined in 'listchars'
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮


@@ -670,8 +701,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()


@@ -769,38 +803,6 @@ let g:tcomment_textobject_inlinecomment = 'gic'
 let g:tcomment#filetype#guess = 0
 "let g:tcomment#options = {'whitespace' : 'no'}
 
 let g:tcomment#filetype#guess = 0
 "let g:tcomment#options = {'whitespace' : 'no'}
 

-" ultisnips {{{2
-let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
-if has('fname_case')
-  let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
-endif
-let g:UltiSnipsExpandTrigger       = "<tab>"
-let g:UltiSnipsJumpForwardTrigger  = "<tab>"
-let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
-
-" UltiSnips completion function that tries to expand a snippet. If there's no
-" snippet for expanding, it checks for completion window and if it's shown,
-" selects first element. If there's no completion window it tries to jump to
-" next placeholder. If there's no placeholder it just returns TAB key
-" https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
-function! g:UltiSnips_Complete()
-    call UltiSnips#ExpandSnippet()
-    if g:ulti_expand_res == 0
-        if pumvisible()
-            return "\<C-n>"
-        else
-            call UltiSnips#JumpForwards()
-            if g:ulti_jump_forwards_res == 0
-               return "\<TAB>"
-            endif
-        endif
-    endif
-    return ""
-endfunction
-au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
-let g:UltiSnipsListSnippets="<c-e>"
-

 " unite {{{2
 call unite#filters#matcher_default#use(['matcher_fuzzy'])
 call unite#custom#profile('default', 'context', {
 " unite {{{2
 call unite#filters#matcher_default#use(['matcher_fuzzy'])
 call unite#custom#profile('default', 'context', {


@@ -970,8 +972,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: