vim: do not Plug youcompleteme in nvim

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 8b35883c1250dfa2c9f56045bd94dac5cc2030bf..d94c7c23a259dbd0d8263cc109dc76976ff27b9b 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,24 +1,43 @@
-" My vimrc.
-"
-" Author:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
-"
+" force python3
+if has('python3') | endif
+
+" space is leader
+let g:mapleader = " "

 
 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 " plugins {{{1
 
 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 " plugins {{{1

-" remove all autocommands
-autocmd!
-

 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 
 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 

-Plug 'airblade/vim-gitgutter'
+Plug 'airblade/vim-gitgutter' " {{{
+" prefer other signs such as ycm diags
+let g:gitgutter_sign_priority = 1
+" don't clobber other signs
+let g:gitgutter_sign_allow_clobber = 0
+"}}}

 Plug 'alepez/vim-gtest'
 Plug 'alepez/vim-gtest'

+Plug 'alx741/vinfo'
+Plug 'andrewradev/sideways.vim' " {{{2
+nnoremap <silent> ,h :SidewaysLeft<CR>:delmarks z<CR>
+nnoremap <silent> ,l :SidewaysRight<CR>:delmarks z<CR>
+"}}}

 Plug 'andrewradev/switch.vim'
 Plug 'andrewradev/switch.vim'

-Plug 'bling/vim-airline'
+if !has('nvim')
+  Plug 'bling/vim-airline' "{{{2
+  let g:airline#extensions#whitespace#enabled = 1
+  let g:airline#extensions#tabline#enabled = 1
+  let g:airline#extensions#searchcount#enabled = 0
+  let g:airline_powerline_fonts = 1
+
+  let g:asyncrun_status = "stopped"
+  " let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
+  "}}}
+endif
+

 Plug 'chrisbra/checkattach'
 Plug 'derekwyatt/vim-fswitch'
 Plug 'elzr/vim-json'
 Plug 'chrisbra/checkattach'
 Plug 'derekwyatt/vim-fswitch'
 Plug 'elzr/vim-json'


@@ -30,32 +49,72 @@ Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'

-Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
-" fix some issue with vim-clang-format not finding .clang-format
-let g:clang_format#detect_style_file = 1
-Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
-Plug 'scrooloose/syntastic'

 Plug 'sgeb/vim-diff-fold'
 Plug 'sgeb/vim-diff-fold'

+Plug 'skywind3000/asyncrun.vim' " {{{2
+command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
+let g:asyncrun_open = 10
+"}}}

 Plug 'shougo/unite.vim'
 Plug 'shougo/vimproc.vim', {'do': 'make'}
 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'
 Plug 'tpope/vim-abolish'
 Plug 'shougo/unite.vim'
 Plug 'shougo/vimproc.vim', {'do': 'make'}
 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'
 Plug 'tpope/vim-abolish'

+Plug 'tpope/vim-characterize'

 Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'

+Plug 'tpope/vim-scriptease'
+Plug 'tpope/vim-speeddating'

 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'

-Plug 'valloric/youcompleteme', { 'do': './install.py --clang-completer' }
+if !has("nvim")
+  " Plug 'valloric/youcompleteme' {{{2
+  Plug 'valloric/youcompleteme',
+        \{ 'do': './install.py --clangd-completer --clang-completer' }
+  let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
+  let g:ycm_clangd_args = ['--clang-tidy']
+  let g:ycm_extra_conf_vim_data = ['getcwd()']
+  let g:ycm_add_preview_to_completeopt = 1
+  let g:ycm_complete_in_comments = 1
+  let g:ycm_complete_in_strings  = 1
+  let g:ycm_autoclose_preview_window_after_insertion = 0
+
+  let g:ycm_language_server =
+        \ [
+        \   {
+        \     'name': 'haskell',
+        \     'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
+        \     'filetypes': [ 'haskell', 'lhaskell'  ]
+        \   },
+        \ ]
+  " }}}
+endif

 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'

+Plug 'wincent/loupe'

 
 " colorschemes
 
 " colorschemes

-Plug 'morhetz/gruvbox'
+Plug 'morhetz/gruvbox' " {{{2
+let g:gruvbox_contrast_dark  = 'hard'
+let g:gruvbox_contrast_light = 'soft'
+
+if !has('nvim')
+  Plug 'arcticicestudio/nord-vim' " {{{2
+  let g:nord_bold = 1
+  let g:nord_italic = 1
+  let g:nord_italic_comments = 1
+  let g:nord_underline = 1
+  let g:nord_uniform_status_lines = 0
+  let g:nord_uniform_diff_background = 0
+  let g:nord_cursor_line_number_background = 0
+  let g:nord_bold_vertical_split_line = 0
+endif
+
+"}}}

 
 " snippets
 Plug 'sirver/ultisnips'
 
 " snippets
 Plug 'sirver/ultisnips'


@@ -68,26 +127,63 @@ Plug 'sgur/vim-textobj-parameter'
 Plug 'kana/vim-operator-user'
 
 " staging
 Plug 'kana/vim-operator-user'
 
 " staging

-" find an alternative (latex-box? Automatic Latex Plugin?)
-Plug 'vim-latex/vim-latex'
-Plug 'alx741/vinfo'
-" needs editing colorscheme
-" Plug 'jeaye/color_coded'

 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp

-Plug 'wincent/loupe'
+Plug 'imsnif/kdl.vim'
+
+Plug 'puremourning/vimspector'
+Plug 'ilyachur/cmake4vim'
+Plug 'ilyachur/gtest-vim'
+
+Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'vim-scripts/syntaxrange'

 
 

+let g:org_agenda_files = ['~/org/*.org']
+
+Plug 'neovimhaskell/haskell-vim'  " {{{2
+let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
+let g:haskell_enable_recursivedo = 1      " to enable highlighting of `mdo` and `rec`
+let g:haskell_enable_arrowsyntax = 1      " to enable highlighting of `proc`
+let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern`
+let g:haskell_enable_typeroles = 1        " to enable highlighting of type roles
+let g:haskell_enable_static_pointers = 1  " to enable highlighting of `static`
+let g:haskell_backpack = 1                " to enable highlighting of backpack keywords
+
+let g:haskell_indent_before_where = 2
+" }}}
+
+Plug 'aklt/plantuml-syntax'
+
+Plug 'mtth/scratch.vim'  " {{{2
+  let g:scratch_no_mappings = 1
+  let g:scratch_autohide = 0
+"}}}
+
+let g:man_hardwrap = 80
+if !has('nvim')
+  Plug 'vim-utils/vim-man'  " {{{2
+  let g:man_width = 80
+"}}}
+endif
+
+Plug 'jenterkin/vim-autosource'  " {{{2
+  let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
+  let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
+"}}}

 call plug#end()
 
 filetype plugin indent on
 call plug#end()
 
 filetype plugin indent on

+syntax on

 
 " colorscheme {{{1
 
 " colorscheme {{{1

-syntax on

 set background=dark
 set background=dark

-let g:gruvbox_contrast_dark  = 'hard'
-let g:gruvbox_contrast_light = 'soft'
-colorscheme gruvbox
-" override the background to be black
-highligh Normal ctermbg=None
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+set termguicolors
+if !has('nvim')
+  colorscheme $THEME
+endif
+"TODO see how I can integrate this into a theme that customises upstream Nord
+hi debugPC term=reverse ctermbg=8

 
 " options {{{1
 " moving around, searching and patterns {{{2
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -113,17 +209,20 @@ 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:❮

+set listchars+=nbsp:␣

 " Only shown when not in insert mode
 set listchars+=trail:·
 augroup trailing
     au!
 " Only shown when not in insert mode
 set listchars+=trail:·
 augroup trailing
     au!

-    au InsertEnter * :set listchars-=trail:·
-    au InsertLeave * :set listchars+=trail:·
+    au FileType qf setlocal listchars-=trail:·
+    au InsertEnter * set listchars-=trail:·
+    au InsertLeave * set listchars+=trail:·

 augroup END
 
 set scrolloff=5                 " number of screen lines to show around the cursor
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars
 augroup END
 
 set scrolloff=5                 " number of screen lines to show around the cursor
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars

+set display+=lastline           " display as much as possible of last line

 
 set fillchars=diff:⣿,vert:│
 
 
 set fillchars=diff:⣿,vert:│
 


@@ -152,7 +251,9 @@ set ttyfast
 
 " using the mouse {{{2
 set mouse=rnv                   " list of flags for using the mouse
 
 " using the mouse {{{2
 set mouse=rnv                   " list of flags for using the mouse

-set ttymouse=xterm              " type of mouse
+if !has('nvim')
+  set ttymouse=xterm              " type of mouse
+endif

 
 " messages and info {{{2
 set showcmd         " Show (partial) command in status line.
 
 " messages and info {{{2
 set showcmd         " Show (partial) command in status line.


@@ -167,6 +268,7 @@ set shortmess+=T    " truncate other messages in the middle
 set shortmess+=W    " don't give 'written' or '[w]' when writing a file
 set shortmess+=A    " ignore swapfile warning
 set shortmess+=I    " no splash screen
 set shortmess+=W    " don't give 'written' or '[w]' when writing a file
 set shortmess+=A    " ignore swapfile warning
 set shortmess+=I    " no splash screen

+set shortmess+=c    " don't give |ins-completion-menu| messages

 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode
 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode


@@ -183,7 +285,8 @@ set formatoptions+=l    " do not wrap lines that have been longer when starting
 set formatoptions+=t    " Auto-wrap text using textwidth
 set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 
 set formatoptions+=t    " Auto-wrap text using textwidth
 set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 

-set nrformats=hex               " number formats recognized for CTRL-A and CTRL-X commands
+set nrformats-=octal    " don't inc/dec octal numbers with ^[AX]
+set nrformats+=unsigned " treat all numbers as unsigned

 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows
 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows


@@ -220,6 +323,8 @@ set viewoptions+=folds          " save folds
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes

+set diffopt+=internal
+set diffopt+=algorithm:patience

 
 " reading and writing files {{{2
 set modeline                    " read modelines
 
 " reading and writing files {{{2
 set modeline                    " read modelines


@@ -233,7 +338,10 @@ set backupskip+=.netrc          " skip netrc
 set backupskip+=/dev/shm/pass*  " skip passwordstore files
 
 set undofile                    " persistent undo history
 set backupskip+=/dev/shm/pass*  " skip passwordstore files
 
 set undofile                    " persistent undo history

-set undodir=$XDG_CACHE_HOME/vim/undo//
+set undolevels=10000            " moar undos
+if !has('nvim')
+  set undodir=$XDG_CACHE_HOME/vim/undo//
+endif

 
 augroup undoskip
     au!
 
 augroup undoskip
     au!


@@ -268,6 +376,7 @@ set wildignore+=*.orig                           " Merge resolution files
 " running make and jumping to errors {{{2
 set makeprg=make\ -w     " print changing directories
 
 " running make and jumping to errors {{{2
 set makeprg=make\ -w     " print changing directories
 

+set grepformat=%f:%l:%c:%m

 set grepprg=ag\ --vimgrep\ $*
 
 " language specific {{{2
 set grepprg=ag\ --vimgrep\ $*
 
 " language specific {{{2


@@ -276,7 +385,15 @@ set isfname-==    " don't treat `=` as being part of filenames
 " various {{{2
 set virtualedit+=block     " let cursor move past last char in <C-V> mode
 set virtualedit+=onemore   " allow the cursor to move just past the end of the line
 " various {{{2
 set virtualedit+=block     " let cursor move past last char in <C-V> mode
 set virtualedit+=onemore   " allow the cursor to move just past the end of the line

-set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
+if !has('nvim')
+  " viminfo defaults but save file in .cache
+  set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo
+else
+  " shada is the replacement format for viminfo
+  " this setting is probably not needed as it's most likely the default
+  " the default path is in XDG_DATA_HOME, which is fine
+  set shada='100,<50,s10,h
+endif

 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 
 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 


@@ -284,9 +401,9 @@ set sessionoptions+=unix,slash  " damn windows and it's silly ways
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2

-augroup resize
+augroup resize_splits

     au!
     au!

-    autocmd VimResized * :wincmd =
+    autocmd VimResized * :tabdo wincmd =

 augroup END
 
 " Only show cursorline in the current window and in normal mode {{{2
 augroup END
 
 " Only show cursorline in the current window and in normal mode {{{2


@@ -303,7 +420,7 @@ augroup ft_stdin
 augroup END
 
 " Jump to last known cursor position {{{2
 augroup END
 
 " Jump to last known cursor position {{{2

-augroup cursor_pos
+augroup last_loc

     au!
     " blacklist certain filetype
     let blacklist = ['gitcommit']
     au!
     " blacklist certain filetype
     let blacklist = ['gitcommit']


@@ -331,19 +448,28 @@ augroup END
 command! NoAutoChecktime let b:autochecktime=0
 command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
 
 command! NoAutoChecktime let b:autochecktime=0
 command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
 

-augroup terminal
-  au!
-  au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
-augroup END
-

 " bindings {{{1
 
 " bindings {{{1
 

-" allow both <space> and \ to be <leader>
-map <space> <leader>
-

 " make
 " make

-nnoremap <leader>r :make!<cr>
-nnoremap <leader><cr> :make!<cr>
+function! MakeWithOpt()
+  " TODO only do this if makeprg matches make
+  " if &makeprg =~ "make"
+  let l:make_dir = ""
+  if exists("b:make_dir")
+    let l:make_dir = "-C ".b:make_dir
+  elseif exists("t:make_dir")
+    let l:make_dir = "-C ".t:make_dir
+  elseif exists("g:make_dir")
+    let l:make_dir = "-C ".g:make_dir
+  endif
+
+  let l:make_targets = ""
+  if exists("g:make_targets")
+    let l:make_targets = g:make_targets
+  endif
+  execute "Make ".l:make_dir." ".l:make_targets
+endf
+nnoremap <silent> <leader>r :call MakeWithOpt()<cr>

 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>


@@ -384,7 +510,11 @@ noremap ' `
 nnoremap vv ^vg_
 
 " Unfuck my screen
 nnoremap vv ^vg_
 
 " Unfuck my screen

-nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
+nnoremap U
+      \ :syntax sync fromstart<cr>
+      \ :AirlineRefresh<cr>
+      \ :call popup_clear(1)<cr>
+      \ :redraw!<cr>

 
 " Ranger
 " nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>
 
 " Ranger
 " nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>


@@ -503,15 +633,18 @@ inoremap <C-C> <Esc>gUiwgi
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " plugins options {{{1
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " plugins options {{{1

-" airline {{{2
-let g:airline#extensions#whitespace#enabled = 1
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_powerline_fonts = 1
-

 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 let g:checkattach_once = 'y'
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 let g:checkattach_once = 'y'
 

+" close-another-window {{{2
+nnoremap <silent> <C-W>c  <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<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
 " delimitmate {{{2
 let delimitMate_expand_cr = 2
 let g:delimitMate_expand_space = 1


@@ -532,19 +665,42 @@ nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
 " delete fugitive buffers when closed
 autocmd BufReadPost fugitive://* set bufhidden=delete
 
 " delete fugitive buffers when closed
 autocmd BufReadPost fugitive://* set bufhidden=delete
 

-nnoremap <silent> <leader>gs :Gstatus<CR>
-nnoremap <silent> <leader>gd :Gdiff<CR>
-nnoremap <silent> <leader>gc :Gcommit -v<CR>
+function! GitToggle()
+  let l:status_buffer = bufname('^fugitive:///*/.git{/worktrees/*,}//$')
+  if buflisted(l:status_buffer)
+    execute 'bdelete '.l:status_buffer
+  else
+    Git
+    16wincmd_
+  endif
+endfunction
+command! GitToggle :call GitToggle()
+command! GToggle GitToggle
+nnoremap <silent> <leader>gs :GitToggle<CR>
+
+nnoremap <silent> <leader>gd :Gdiffsplit<CR>
+nnoremap <silent> <leader>gc :echohl WarningMsg \| echo "use \<leader>gcc instead" \| echohl None<CR> 
+nnoremap <silent> <leader>gcc :tab G commit -v<CR>
+nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
+nnoremap          <leader>gcf :tab G commit -v --fixup=
+nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR> 
+nnoremap <silent> <leader>gpp :Git push \| copen<CR>
+nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
+nnoremap <silent> <leader>gll :Git pull<CR>
+nnoremap <silent> <leader>gru :Git rebase --interactive @{upstream}<CR>
+nnoremap <silent> <leader>grp :Git rebase --interactive @{push}<CR>

 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>ga :Gwrite<cr>

-nnoremap <silent> <leader>gb :Gblame<cr>
+nnoremap <silent> <leader>gb :G blame<cr>

 
 augroup fugitive_gstatus
     au!
 
 augroup fugitive_gstatus
     au!

-    autocmd BufWinEnter */.git/index resize 16
+    autocmd User FugitiveIndex setlocal winfixheight
+    autocmd User FugitiveIndex nmap <buffer> <leader><space> =

 augroup end
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 augroup end
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>

+let g:gundo_prefer_python3 = 1

 
 " indent-guides {{{2
 let g:indent_guides_default_mapping = 0
 
 " indent-guides {{{2
 let g:indent_guides_default_mapping = 0


@@ -553,14 +709,6 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 

-" close-another-window {{{2
-nnoremap <silent> <C-W>c  <NOP>
-nnoremap <silent> <C-W>cc <C-W>c
-nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
-nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
-nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
-nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
-

 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0


@@ -583,6 +731,9 @@ let g:SignatureMap = {
 
 " switch
 let g:switch_mapping = "<Leader>s"
 
 " switch
 let g:switch_mapping = "<Leader>s"

+let g:switch_custom_definitions = [
+      \   ['yes', 'no']
+      \ ]

 
 " spellrotate
 nmap <silent> z] <Plug>(SpellRotateForward)
 
 " spellrotate
 nmap <silent> z] <Plug>(SpellRotateForward)


@@ -616,10 +767,11 @@ let g:tagbar_iconchars = ['+', '-']
 " tcomments {{{2
 let g:tcomment_textobject_inlinecomment = 'gic'
 let g:tcomment#filetype#guess = 0
 " tcomments {{{2
 let g:tcomment_textobject_inlinecomment = 'gic'
 let g:tcomment#filetype#guess = 0

+"let g:tcomment#options = {'whitespace' : 'no'}

 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'

-let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
+let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]

 if has('fname_case')
   let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
 endif
 if has('fname_case')
   let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
 endif


@@ -673,7 +825,7 @@ if executable('ag')
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
 nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
 nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>

-command! -nargs=1 Ag Unite grep:.::<args>
+command! -nargs=+ Ag Unite grep:.::<args>

 
 " unite-file_rec {{{3
 if executable('ag')
 
 " unite-file_rec {{{3
 if executable('ag')


@@ -687,6 +839,9 @@ call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')
 call unite#custom#default_action('buffer', 'open')
 nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
 
 call unite#custom#default_action('buffer', 'open')
 nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
 

+" unite-jumplist {{{3
+nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<CR>
+

 " unite-menu {{{3
 let g:unite_source_menu_menus = {}
 let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}
 let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}


@@ -712,35 +867,24 @@ function! YRRunAfterMaps()
     nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
 endfunction
 
     nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
 endfunction
 

-" youcompleteme {{{2
-let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
-let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
-let g:ycm_extra_conf_vim_data = ['getcwd()']
-let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_complete_in_comments = 1
-let g:ycm_complete_in_strings  = 1
-let g:ycm_autoclose_preview_window_after_insertion = 0
-

 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode

-vmap <Enter> <Plug>(EasyAlign)
-nmap ga <Plug>(EasyAlign)
+vmap <Enter>   <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to \16<leader>a now" \| echohl None<CR>
+vmap <leader>a <Plug>(EasyAlign)
+nmap <leader>a <Plug>(EasyAlign)

 
 " vim-gtest {{{2
 let g:gtest#highlight_failing_tests = 0
 
 
 " vim-gtest {{{2
 let g:gtest#highlight_failing_tests = 0
 

-nnoremap <Leader>tt :GTestRun<CR>
-nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
-nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+nnoremap <silent> <Leader>tt :GTestRun<CR>
+nnoremap          <Leader>tc :GTestCase<space>
+nnoremap          <Leader>tn :GTestName<space>
+nnoremap <silent> <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
+nnoremap <silent> <Leader>tu :GTestRunUnderCursor<CR>

 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 

-" vim-latex {{{2
-let g:tex_flavor='latex'
-let g:Tex_DefaultTargetFormat='pdf'
-let g:Tex_MultipleCompileFormats='pdf'
-

 " vim-sneak {{{2
 let g:sneak#streak = 1
 let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
 " vim-sneak {{{2
 let g:sneak#streak = 1
 let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak


@@ -760,15 +904,6 @@ xmap T <Plug>Sneak_T
 omap t <Plug>Sneak_t
 omap T <Plug>Sneak_T
 
 omap t <Plug>Sneak_t
 omap T <Plug>Sneak_T
 

-" vimviki {{{2
-let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
-let g:vimwiki_auto_chdir = 1
-augroup myvimwiki
-  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git -C "%:p:h" pull -q
-  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull -q
-  au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe '!git add "<afile>";git commit -qm"' . strftime("%FT%R") . '";git push -q'
-augroup END
-

 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the
 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the


@@ -787,7 +922,7 @@ nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2

-function! EditConfig(what)
+function! EditConfig(what, ext = '.vim')

     let l:dir = split(&runtimepath,',')[0]
     if a:what == 'vimrc'
         let l:file = expand($MYVIMRC)
     let l:dir = split(&runtimepath,',')[0]
     if a:what == 'vimrc'
         let l:file = expand($MYVIMRC)


@@ -796,7 +931,7 @@ function! EditConfig(what)
     elseif empty(&filetype)
         echoe 'filetype is empty!'
     else
     elseif empty(&filetype)
         echoe 'filetype is empty!'
     else

-        let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim'
+        let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext

     endif
 
     execute ':vsplit '.file
     endif
 
     execute ':vsplit '.file


@@ -806,7 +941,7 @@ nmap <leader>ev :call EditConfig('vimrc')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>
 nmap <leader>ei :call EditConfig('indent')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>
 nmap <leader>ei :call EditConfig('indent')<CR>

-nmap <leader>eu :UltiSnipsEdit<CR>:lcd %:p:h<CR>
+nmap <leader>eu :call EditConfig('ultisnips', '.snippets')<CR>

 
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932
 
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932