nvim: set timeoutlen to 1s like default

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 86d5bfbc85c293684283924e12fa4bb4105ff1de..9fd4ae506530ef6ed32513d0ef5baa4aadf7e18a 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,95 +1,224 @@
-" 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
 
 " plugins {{{1

-filetype off
-set runtimepath& " reset rtp
-" remove all autocommands
-autocmd!
-
-set runtimepath+=$XDG_DATA_HOME/vim/vundle
-call vundle#rc('$XDG_DATA_HOME/vim')
-
-Plugin 'gmarik/vundle'
-
-Plugin 'airblade/vim-gitgutter'
-Plugin 'bling/vim-airline'
-Plugin 'derekwyatt/vim-fswitch'
-Plugin 'elzr/vim-json'
-Plugin 'firef0x/pkgbuild.vim'
-Plugin 'junegunn/vim-easy-align'
-" Plugin 'kien/ctrlp.vim'
-" Plugin 'klen/python-mode'
-Plugin 'wilywampa/python-mode'
-Plugin 'kshenoy/vim-signature'
-Plugin 'majutsushi/tagbar'
-Plugin 'raimondi/delimitmate'
-" Plugin 'rking/ag.vim'
-Plugin 'scrooloose/syntastic'
-Plugin 'shougo/vimproc.vim'
-Plugin 'shougo/unite.vim'
-Plugin 'sjl/gundo.vim'
-Plugin 'tomtom/tcomment_vim'
-Plugin 'tpope/vim-endwise'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-unimpaired'
-Plugin 'valloric/youcompleteme'
-Plugin 'vim-scripts/yankring.vim'
-
-" snippets
-Plugin 'sirver/ultisnips'
-Plugin 'honza/vim-snippets'
+call plug#begin('$XDG_DATA_HOME/vim')
+" This does not update vim-plug, use PlugUpgrade instead
+Plug 'junegunn/vim-plug'
+
+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 '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'
+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

 
 

-" text objects
-Plugin 'kana/vim-textobj-user'
-Plugin 'julian/vim-textobj-variable-segment'
-Plugin 'sgur/vim-textobj-parameter'
+Plug 'chrisbra/checkattach'
+Plug 'derekwyatt/vim-fswitch'
+Plug 'elzr/vim-json'
+Plug 'firef0x/pkgbuild.vim'
+Plug 'junegunn/vim-easy-align'
+Plug 'justinmk/vim-sneak'
+Plug 'klen/python-mode'
+Plug 'kshenoy/vim-signature'
+Plug 'majutsushi/tagbar'
+Plug 'octol/vim-cpp-enhanced-highlight'
+Plug 'raimondi/delimitmate'
+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 'tpope/vim-characterize'
+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'
+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 'wincent/loupe'
+
+" colorschemes
+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

 
 

-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
+"}}}

 
 

-" seems to have problems right now... may be add later?
-" Plugin 'jalcine/cmake.vim'
-" Plugin 'powerman/vim-plugin-viewdoc'
+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'
+Plug 'julian/vim-textobj-variable-segment'
+Plug 'sgur/vim-textobj-parameter'
+Plug 'kana/vim-operator-user'

 
 " staging
 
 " staging

-" find an alternative (latex-box? Automatic Latex Plugin?)
-Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
-" Plugin 'lokaltog/vim-easymotion'
-Plugin 'justinmk/vim-sneak'
-Plugin 'chrisbra/checkattach'
-Plugin 'nathanaelkane/vim-indent-guides'
-Plugin 'alx741/vinfo'
-Plugin 'octol/vim-cpp-enhanced-highlight'
-Plugin 'vim-scripts/mediawiki.vim'
-Plugin 'vim-scripts/replacewithregister'
-Plugin 'tpope/vim-abolish'
-Plugin 'derekwyatt/vim-protodef'
-
-" remove entries first
-set runtimepath -=$HOME/.vim
-set runtimepath -=$HOME/.vim/after
-set runtimepath -=$XDG_CONFIG_HOME/vim
-set runtimepath -=$XDG_CONFIG_HOME/vim/after
-" then prepend and append them
-set runtimepath ^=$XDG_CONFIG_HOME/vim
-set runtimepath +=$XDG_CONFIG_HOME/vim/after
+" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+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
 
 filetype plugin indent on

+syntax on

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

-syntax on
-colorscheme badwolf
+set background=dark
+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
 
 " options {{{1

-" put $ and the end of text to be replaced with 'cw' and the likes
-set cpoptions+=$
-

 " moving around, searching and patterns {{{2
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern
 " moving around, searching and patterns {{{2
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern


@@ -113,17 +242,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
 " Only shown when not in insert mode

-au InsertLeave * :set listchars+=trail:·
+set listchars+=trail:·

 augroup trailing
     au!
 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,13 +284,24 @@ 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
 
 " messages and info {{{2

-set showcmd                     " Show (partial) command in status line.
-set ruler                       " show the cursor position all the time
-set confirm                     " Ask what to do when closing unsaved documents
-set shortmess=filnxtoOI         " don't show intro message
+set showcmd         " Show (partial) command in status line.
+set ruler           " show the cursor position all the time
+set confirm         " Ask what to do when closing unsaved documents
+set shortmess=      " reset option
+set shortmess+=a    " all abbreviations
+set shortmess+=o    " overwrite file-written message
+set shortmess+=O    " file-read message overrides previous
+set shortmess+=t    " truncate file message at start
+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+=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


@@ -172,14 +315,19 @@ set formatoptions+=r    " Insert comment leader after hitting <Enter>
 set formatoptions+=n    " Recognize numbered lists
 set formatoptions+=q    " Allow formatting of comments with "gq".
 set formatoptions+=l    " do not wrap lines that have been longer when starting insert mode already
 set formatoptions+=n    " Recognize numbered lists
 set formatoptions+=q    " Allow formatting of comments with "gq".
 set formatoptions+=l    " do not wrap lines that have been longer when starting insert mode already

+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+=b      " scan other loaded buffers that are in the buffer list
 set complete+=u      " scan the unloaded buffers that are in the buffer list
 set complete+=t      " scan tags
 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows
 set complete+=b      " scan other loaded buffers that are in the buffer list
 set complete+=u      " scan the unloaded buffers that are in the buffer list
 set complete+=t      " scan tags

+set complete+=i      " scan current and included files
+set complete+=kspell " use the currently active spell checking |spell|

 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview


@@ -201,13 +349,15 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " open folds when jumping to line
 set foldopen+=jump
 
 " open folds when jumping to line
 set foldopen+=jump
 

-" save and restore folds
-set viewoptions=cursor          " only save cursor position
+set viewoptions=cursor          " save cursor position
+set viewoptions+=folds          " save folds

 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split

-set diffopt+=iwhite         " ignore white space
+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


@@ -221,7 +371,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!


@@ -241,6 +394,7 @@ set directory=$XDG_CACHE_HOME/vim/swap//
 set history=5000                " how many command lines are remembered
 set wildmenu                    " command-line completion shows a list of matches
 set wildmode=longest:full,full  " specifies how command line completion works
 set history=5000                " how many command lines are remembered
 set wildmenu                    " command-line completion shows a list of matches
 set wildmode=longest:full,full  " specifies how command line completion works

+set wildignorecase              " ignore case when completing file names

 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files
 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files


@@ -252,17 +406,37 @@ set wildignore+=*.luac                           " Lua byte code
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 

+" 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 isfname-==    " don't treat `=` as being part of filenames
+

 " various {{{2
 " various {{{2

-set virtualedit=all             " let cursor move past last char in <C-V> mode
-set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
+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
+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//
 

+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


@@ -279,7 +453,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']


@@ -289,14 +463,46 @@ augroup cursor_pos
                 \ endif
 augroup END
 
                 \ endif
 augroup END
 

-" bindings {{{1
+" Check for file modifications automatically {{{2
+" (current buffer only)
+" Use :NoAutoChecktime to disable it (uses b:autochecktime)
+fun! MyAutoCheckTime()
+  " only check timestamp for normal files
+  if &buftype != '' | return | endif
+  if ! exists('b:autochecktime') || b:autochecktime
+    checktime %
+    let b:autochecktime = 1
+  endif
+endfun
+augroup MyAutoChecktime
+  au!
+  au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime()
+augroup END
+command! NoAutoChecktime let b:autochecktime=0
+command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime

 
 

-" allow both <space> and / to be <leader>
-map <space> <leader>
+" bindings {{{1

 
 " 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>


@@ -310,8 +516,21 @@ nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard
 nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 
 " paste from clipboard
 nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 

-" Clean trailing whitespace
-nnoremap <silent> <leader>ww m':%s/\s\+$//<cr>:let @/=''<cr>``zz
+" strip trailing whitespace
+function! StripWhitespace(line1, line2, ...)  " {{{2
+  let s_report = &report
+  let &report=0
+  let pattern = a:0 ? a:1 : '\s\+$'
+  let oldview = winsaveview()
+  exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
+  if oldview != winsaveview()
+    redraw
+  endif
+  call winrestview(oldview)
+  let &report = s_report
+endfunction  " }}}2
+command! -range=% -nargs=0 -bar Untrail keepjumps call StripWhitespace(<line1>,<line2>)
+nnoremap <silent> <leader>ww :Untrail<CR>

 
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>


@@ -324,7 +543,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>


@@ -361,8 +584,8 @@ cnoremap <C-A> <Home>
 cnoremap <C-E> <End>
 
 " proper movement when lines are wrapped
 cnoremap <C-E> <End>
 
 " proper movement when lines are wrapped

-noremap <expr> j (v:count == 0 ? 'gj' : 'j')
-noremap <expr> k (v:count == 0 ? 'gk' : 'k')
+noremap <silent><expr> j (v:count == 0 ? 'gj' : 'j')
+noremap <silent><expr> k (v:count == 0 ? 'gk' : 'k')

 
 " disable arrows
 noremap  <Up>    <NOP>
 
 " disable arrows
 noremap  <Up>    <NOP>


@@ -387,15 +610,20 @@ nnoremap zx zMzxzt
 
 map <F1> :ls<CR>:b<space>
 
 
 map <F1> :ls<CR>:b<space>
 

-nnoremap <C-L> <C-W>w
-nnoremap <C-H> <C-W>W
+" move between windows (skip previewwindow)
+nnoremap <silent> <C-L> <C-W>w<C-W>:if &previewwindow \| wincmd w \| endif<CR>
+nnoremap <silent> <C-H> <C-W>W<C-W>:if &previewwindow \| wincmd W \| endif<CR>
+tnoremap <silent> <C-L> <C-W>w<C-W>:if &previewwindow \| wincmd w \| endif<CR>
+tnoremap <silent> <C-H> <C-W>W<C-W>:if &previewwindow \| wincmd W \| endif<CR>

 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>
 vnoremap <MiddleMouse> s<MiddleMouse>
 
 " fix legacy vi inconsistency
 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>
 vnoremap <MiddleMouse> s<MiddleMouse>
 
 " fix legacy vi inconsistency

-map Y y$
+nnoremap Y y$
+" copy to clipboard
+xnoremap Y "+y

 
 " allow repeat operator on visual
 vnoremap . :normal .<CR>
 
 " allow repeat operator on visual
 vnoremap . :normal .<CR>


@@ -415,19 +643,21 @@ nnoremap [oe :set expandtab<CR>
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)

-  exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+  exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'

 endfor
 
 endfor
 

+" toggle auto format of text
+nnoremap coa :set <C-R>=&formatoptions =~ "a" ? 'formatoptions-=a' : 'formatoptions+=a'<CR><CR>
+nnoremap [oa :set formatoptions+=a<CR>
+nnoremap ]oa :set formatoptions-=a<CR>
+

 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection
 vnoremap <leader><Space> zf
 
 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection
 vnoremap <leader><Space> zf
 

-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
-

 " save with sudo
 " save with sudo

-cabbrev w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite

 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi
 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi


@@ -435,20 +665,19 @@ inoremap <C-C> <Esc>gUiwgi
 " http://git.io/v3ZeU
 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>
 
 " http://git.io/v3ZeU
 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>
 

-" commands {{{1
-command! Cd lcd %:h
-command! Cr execute('lcd ' . FindGitDirOrHome())
-

 " plugins options {{{1
 " 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


@@ -469,14 +698,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!
+    autocmd User FugitiveIndex setlocal winfixheight
+    autocmd User FugitiveIndex nmap <buffer> <leader><space> =
+augroup end

 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 
 " 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


@@ -489,10 +746,34 @@ nmap <silent> ]og <Plug>IndentGuidesDisable
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0

+let g:pymode_run = 0

 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"

+let g:pymode_lint_cwindow = 0           " don't open cwindow when linting

 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 

+" signature {{{2
+" disable '[ mappings
+
+let g:SignatureMap = {
+  \ 'GotoNextLineAlpha'  :  "",
+  \ 'GotoPrevLineAlpha'  :  "",
+  \ 'GotoNextSpotAlpha'  :  "",
+  \ 'GotoPrevSpotAlpha'  :  "",
+  \ }
+
+" switch
+let g:switch_mapping = "<Leader>s"
+let g:switch_custom_definitions = [
+      \   ['yes', 'no']
+      \ ]
+
+" spellrotate
+nmap <silent> z] <Plug>(SpellRotateForward)
+nmap <silent> z[ <Plug>(SpellRotateBackward)
+vmap <silent> z] <Plug>(SpellRotateForwardV)
+vmap <silent> z[ <Plug>(SpellRotateBackwardV)
+

 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'


@@ -502,6 +783,8 @@ let g:syntastic_style_warning_symbol='S'
 let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 
 let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 

+let g:syntastic_cpp_clang_tidy_post_args = "-p build*"
+

 if ! &diff
   let g:syntastic_check_on_open=1
 endif
 if ! &diff
   let g:syntastic_check_on_open=1
 endif


@@ -514,35 +797,10 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 

-" ultisnips {{{2
-let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
-let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
-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>"
+" tcomments {{{2
+let g:tcomment_textobject_inlinecomment = 'gic'
+let g:tcomment#filetype#guess = 0
+"let g:tcomment#options = {'whitespace' : 'no'}

 
 " unite {{{2
 call unite#filters#matcher_default#use(['matcher_fuzzy'])
 
 " unite {{{2
 call unite#filters#matcher_default#use(['matcher_fuzzy'])


@@ -553,6 +811,9 @@ call unite#custom#profile('default', 'context', {
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]

+nnoremap [unite]u :UniteResume<CR>
+nnoremap <silent> [u :UnitePrevious<CR>
+nnoremap <silent> ]u :UniteNext<CR>

 
 " unite-grep {{{3
 " seems not respected
 
 " unite-grep {{{3
 " seems not respected


@@ -560,22 +821,27 @@ let g:unite_source_grep_max_candidates = 2000
 if executable('ag')
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'
 if executable('ag')
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'

-    let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''

     let g:unite_source_grep_recursive_opt = ''
 end
     let g:unite_source_grep_recursive_opt = ''
 end

-nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>
-command! -nargs=1 Ag Unite grep -input=<args>
+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=+ Ag Unite grep:.::<args>

 
 " unite-file_rec {{{3
 if executable('ag')
     " Use ag in unite rec source
 
 " unite-file_rec {{{3
 if executable('ag')
     " Use ag in unite rec source

-    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
+    let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']

 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>

+call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')

 
 " unite-buffer {{{3
 
 " unite-buffer {{{3

-call unite#custom#default_action('buffer', 'goto')
-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 = {}
 
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}


@@ -602,28 +868,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_autoclose_preview_window_after_insertion = 0
-"let g:ycm_extra_conf_vim_data = ['%:p']
-nnoremap <leader>jd :YcmCompleter GoTo<CR>
-

 " 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
+
+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


@@ -653,8 +915,15 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
                   \ | wincmd p | diffthis
 endif
 

+" sort operator {{{2
+function! SortLinesOpFunc(...)
+  '[,']sort
+endfunction
+nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
+vnoremap <silent> gs :sort<cr>
+

 " edit configs  {{{2
 " 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)


@@ -663,7 +932,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


@@ -673,7 +942,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


@@ -722,5 +991,9 @@ function! FindGitDirOrHome()
     return '~'
   endif
 endfunction
     return '~'
   endif
 endfunction

+command! Cd cd %:h
+command! Cdr execute('cd ' . FindGitDirOrHome())
+command! LCd lcd %:h
+command! LCdr execute('lcd ' . FindGitDirOrHome())

 
 " vim:set et sw=2 ts=2 tw=78:
 
 " vim:set et sw=2 ts=2 tw=78: