vimrc overhaul

nvim/.config/nvim/autoload/plug.vim

@@ -434,8 +434,8 @@ endfunction
 
 function! s:dobufread(names)
   for name in a:names
-    let path = s:rtp(g:plugs[name]).'/**'
-    for dir in ['ftdetect', 'ftplugin']
+    let path = s:rtp(g:plugs[name])
+    for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
       if len(finddir(dir, path))
         if exists('#BufRead')
           doautocmd BufRead
@@ -2224,7 +2224,7 @@ function! s:upgrade()
   let new = tmp . '/plug.vim'
 
   try
-    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+    let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
     if v:shell_error
       return s:err('Error upgrading vim-plug: '. out)
     endif

nvim/.config/nvim/autoload/plug.vim.old

@@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
 let s:plug_tab = get(s:, 'plug_tab', -1)
 let s:plug_buf = get(s:, 'plug_buf', -1)
 let s:mac_gui = has('gui_macvim') && has('gui_running')
-let s:is_win = has('win32') || has('win64')
+let s:is_win = has('win32')
 let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
 let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
 let s:me = resolve(expand('<sfile>:p'))
@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
   endtry
 endfunction
 
+function! s:lazy(plug, opt)
+  return has_key(a:plug, a:opt) &&
+        \ (empty(s:to_a(a:plug[a:opt]))         ||
+        \  !isdirectory(a:plug.dir)             ||
+        \  len(s:glob(s:rtp(a:plug), 'plugin')) ||
+        \  len(s:glob(s:rtp(a:plug), 'after/plugin')))
+endfunction
+
 function! plug#end()
   if !exists('g:plugs')
     return s:err('Call plug#begin() first')
@@ -214,7 +222,7 @@ function! plug#end()
       continue
     endif
     let plug = g:plugs[name]
-    if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
+    if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
       let s:loaded[name] = 1
       continue
     endif
@@ -763,6 +771,9 @@ function! s:prepare(...)
     execute 'silent! unmap <buffer>' k
   endfor
   setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
+  if exists('+colorcolumn')
+    setlocal colorcolumn=
+  endif
   setf vim-plug
   if exists('g:syntax_on')
     call s:syntax()
@@ -799,7 +810,7 @@ function! s:bang(cmd, ...)
     let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
     if s:is_win
       let batchfile = tempname().'.bat'
-      call writefile(['@echo off', cmd], batchfile)
+      call writefile(["@echo off\r", cmd . "\r"], batchfile)
       let cmd = batchfile
     endif
     let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
@@ -1008,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
     let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
   endif
 
+  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
+
   " Python version requirement (>= 2.7)
   if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
     redir => pyv
@@ -1099,7 +1112,7 @@ function! s:update_finish()
       if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
             \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
         call s:log4(name, 'Updating submodules. This may take a while.')
-        let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
+        let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
       endif
       let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
       if v:shell_error
@@ -1196,7 +1209,7 @@ function! s:spawn(name, cmd, opts)
   let s:jobs[a:name] = job
   let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
   if !empty(job.batchfile)
-    call writefile(['@echo off', cmd], job.batchfile)
+    call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
     let cmd = job.batchfile
   endif
   let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
@@ -1318,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
 
   let name = keys(s:update.todo)[0]
   let spec = remove(s:update.todo, name)
-  let new  = !isdirectory(spec.dir)
+  let new  = empty(globpath(spec.dir, '.git', 1))
 
   call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
   redraw
@@ -2023,7 +2036,7 @@ function! s:system(cmd, ...)
     let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
     if s:is_win
       let batchfile = tempname().'.bat'
-      call writefile(['@echo off', cmd], batchfile)
+      call writefile(["@echo off\r", cmd . "\r"], batchfile)
       let cmd = batchfile
     endif
     return system(s:is_win ? '('.cmd.')' : cmd)
@@ -2357,7 +2370,7 @@ function! s:preview_commit()
     let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
     if s:is_win
       let batchfile = tempname().'.bat'
-      call writefile(['@echo off', cmd], batchfile)
+      call writefile(["@echo off\r", cmd . "\r"], batchfile)
       let cmd = batchfile
     endif
     execute 'silent %!' cmd
@@ -2407,7 +2420,11 @@ function! s:diff()
     call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
     for [k, v] in plugs
       let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-      let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
+      let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
+      if has_key(v, 'rtp')
+        let cmd .= ' -- '.s:shellesc(v.rtp)
+      endif
+      let diff = s:system_chomp(cmd, v.dir)
       if !empty(diff)
         let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
         call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
@@ -2426,8 +2443,13 @@ function! s:diff()
         \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
 
   if cnts[0] || cnts[1]
-    nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
-    nnoremap <silent> <buffer> o    :silent! call <SID>preview_commit()<cr>
+    nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
+    if empty(maparg("\<cr>", 'n'))
+      nmap <buffer> <cr> <plug>(plug-preview)
+    endif
+    if empty(maparg('o', 'n'))
+      nmap <buffer> o <plug>(plug-preview)
+    endif
   endif
   if cnts[0]
     nnoremap <silent> <buffer> X :call <SID>revert()<cr>

nvim/.config/nvim/init.vim

@@ -1,37 +1,38 @@
 call plug#begin('~/.dotfiles/nvim/.config/nvim/plugged')
-	Plug 'Raimondi/delimitMate'
 	Plug 'morhetz/gruvbox'
-	Plug 'scrooloose/nerdtree'
-	Plug 'godlygeek/tabular'
-	Plug 'tomtom/tcomment_vim'
 	Plug 'bling/vim-airline'
-	Plug 'tommcdo/vim-exchange'
+
+	Plug 'Raimondi/delimitMate'
+	Plug 'scrooloose/nerdtree'
+	Plug 'tomtom/tcomment_vim'
 	Plug 'tpope/vim-surround'
 	Plug 'christoomey/vim-tmux-navigator'
-	"Plug 'MarcWeber/vim-addon-mw-utils'
-	"Plug 'tomtom/tlib_vim'
-	"Plug 'SirVer/ultisnips'
-	"Plug 'honza/vim-snippets'
 	Plug 'tpope/vim-dispatch'
-	"Plug 'tpope/vim-unimpaired'
 	Plug 'milkypostman/vim-togglelist'
 	Plug 'moll/vim-bbye'
-	"Plug 'tpope/vim-fugative'
 	Plug 'junegunn/fzf', {'do': './install --bin'}
-	"Plug 'Valloric/YouCompleteMe', {'do': './install.py --clang-completer --go-completer --rust-completer --js-completer --java-completer'}
-	Plug 'Valloric/YouCompleteMe', {'do': './install.py --clang-completer'}
+
+	Plug 'prabirshrestha/async.vim'
+	Plug 'prabirshrestha/vim-lsp'
+	Plug 'prabirshrestha/asyncomplete.vim'
+	Plug 'prabirshrestha/asyncomplete-lsp.vim'
+	Plug 'prabirshrestha/asyncomplete-buffer.vim'
+	Plug 'prabirshrestha/asyncomplete-file.vim'
+	Plug 'wellle/tmux-complete.vim'
+	" Plug 'OmniSharp/omnisharp-vim'
 
 	Plug 'digitaltoad/vim-pug'
 	Plug 'tikhomirov/vim-glsl'
 	Plug 'rust-lang/rust.vim'
+	Plug 'OrangeT/vim-csharp'
 call plug#end()
 
-" Setup custom syntax
-au BufRead,BufNewFile *.lang setfiletype lang
-
 " Load vim config in current directory
 silent! so .vimlocal
 
+" DelimitMate
+let delimitMate_expand_cr = 1
+
 " Theme
 colorscheme gruvbox
 set t_Co=256
@@ -45,6 +46,11 @@ set list lcs=tab:\|\
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_theme='gruvbox'
+let g:airline_section_z = '%3p%% %#__accent_bold#%4l%#__restore__#%#__accent_bold#/%L%#__restore__# :%3v'
+let g:airline_section_warning = ''
+
+" NERDTree
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 
 " Preferences
 syntax on
@@ -56,12 +62,11 @@ set softtabstop=4
 set tabstop=4
 set shiftwidth=4
 set noexpandtab
-set mouse=a
+set mouse=n
 
-" DelimitMate
-let delimitMate_expand_cr = 1
-
-let mapleader = '\'
+" Setup custom syntax
+au BufRead,BufNewFile *.lang setfiletype lang
+au BufRead,BufNewFile *.razor setfiletype cshtml
 
 " Keybindings
 map <silent> <F2> :NERDTreeToggle<cr>
@@ -76,9 +81,16 @@ map <silent> <S-k> 10k
 map <silent> <C-b> :Bdelete<cr>
 map <silent> <F4> :call ToggleQuickfixList()<cr>
 
+map <leader>N :LspNextError<cr>
+map <leader>P :LspPreviousError<cr>
 map <leader>n :cnext<cr>
 map <leader>p :cprevious<cr>
 
+inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+inoremap <expr> <cr>    pumvisible() ? "\<C-y>" : "\<cr>"
+imap <c-space> <Plug>(asyncomplete_force_refresh)
+
 " Fold in functions
 fu! CustomFoldText()
     "get first non-blank line
@@ -107,7 +119,9 @@ au BufRead *.cpp,*.h,*.go,*.js setlocal foldmethod=syntax
 au BufRead *.cpp,*.h,*.go,*.js setlocal foldnestmax=2
 
 " Use fzf and silver searcher to search files (REQUIRES: the_silver_searcher)
+if executable('ag')
 	map <silent> <C-p> :call fzf#run(fzf#wrap('custom', {'source': 'ag -g ""'}, 0))<cr>
+endif
 let g:fzf_layout = {'down': '~20%'}
 let g:fzf_colors =
 \ { 'fg':	['fg', 'Normal'],
@@ -124,13 +138,66 @@ let g:fzf_colors =
   \ 'spinner':	['fg', 'Label'],
   \ 'header':	['fg', 'Comment'] }
 
-" YouCompleteMe
-set completeopt=menuone,menu
-let g:ycm_confirm_extra_conf = 0
-let g:ycm_error_symbol = ''
-let g:ycm_warning_symbol = ''
-let g:ycm_max_diagnostics_to_display = 0
+" vim-lsp
+if executable('clangd')
+    au User lsp_setup call lsp#register_server({
+        \ 'name': 'clangd',
+        \ 'cmd': {server_info->['clangd', '-background-index']},
+        \ 'whitelist': ['c', 'cpp', 'objc', 'objcpp'],
+        \ })
+endif
 
-inoremap <Tab> <C-Space>
+if executable('pyls')
+    au User lsp_setup call lsp#register_server({
+        \ 'name': 'pyls',
+        \ 'cmd': {server_info->['pyls']},
+        \ 'whitelist': ['python'],
+        \ })
+endif
 
-" Ultisni g:UltiSnipsExpandTrigger='<C-s>'
+au User lsp_setup call lsp#register_server({
+	\ 'name': 'omnisharp',
+	\ 'cmd': {server_info->['mono', '/home/tim/Downloads/omnisharp-mono/OmniSharp.exe', '-lsp']},
+	\ 'whitelist': ['cs'],
+	\ })
+
+let g:lsp_text_edit_enabled = 0
+let g:lsp_signs_enabled = 1
+let g:lsp_signs_error = {'text': ''}
+let g:lsp_signs_warning = {'text': ''}
+let g:lsp_highlights_enabled = 0
+let g:lsp_virtual_text_enabled = 1
+
+let g:lsp_log_verbose = 1
+let g:lsp_log_file = expand('~/vim-lsp.log')
+
+highlight lspReference ctermfg=red guifg=red ctermbg=green guibg=green
+
+highlight link LspErrorText GruvBoxRedSign
+highlight link LspWarningText GruvBoxYellowSign
+
+" asyncomplete
+call asyncomplete#register_source(asyncomplete#sources#buffer#get_source_options({
+    \ 'name': 'buffer',
+    \ 'whitelist': ['*'],
+    \ 'completor': function('asyncomplete#sources#buffer#completor'),
+    \ }))
+
+au User asyncomplete_setup call asyncomplete#register_source(asyncomplete#sources#file#get_source_options({
+    \ 'name': 'file',
+    \ 'whitelist': ['*'],
+    \ 'completor': function('asyncomplete#sources#file#completor')
+    \ }))
+
+let g:tmuxcomplete#asyncomplete_source_options = {
+            \ 'name':      'tmux',
+            \ 'whitelist': ['*'],
+            \ 'config': {
+            \     'splitmode':      'words',
+            \     'filter_prefix':   1,
+            \     'show_incomplete': 1,
+            \     'sort_candidates': 0,
+            \     'scrollback':      0,
+            \     'truncate':        0
+            \     }
+            \ }

tmux/.tmux.conf

@@ -26,27 +26,19 @@ bind -n C-M-l swap-window -t +1
 bind -n C-M-h swap-window -t -1
 bind X kill-window
 
-set -g status-bg "colour237"
-set -g message-command-fg "colour246"
+set -g status-style "bg=colour237"
+set -g message-command-style "fg=colour246"
 set -g status-justify "left"
 set -g status-left-length "100"
 set -g status "on"
-set -g pane-active-border-fg "colour246"
-set -g message-bg "colour239"
+set -g pane-active-border-style "fg=colour246"
 set -g status-right-length "100"
-set -g status-right-attr "none"
-set -g message-fg "colour246"
-set -g message-command-bg "colour239"
-set -g status-attr "none"
-set -g pane-border-fg "colour239"
-set -g status-left-attr "none"
-setw -g window-status-fg "colour246"
-setw -g window-status-attr "none"
-setw -g window-status-activity-bg "colour237"
-setw -g window-status-activity-attr "none"
-setw -g window-status-activity-fg "colour246"
+set -g message-style "fg=colour246,bg=colour239"
+set -g message-command-style "bg=colour239"
+set -g pane-border-style "fg=colour239"
+setw -g window-status-style "fg=colour246,bg=colour237"
+setw -g window-status-activity-style "fg=colour246,bg=colour237"
 setw -g window-status-separator ""
-setw -g window-status-bg "colour237"
 set -g status-left "#[fg=colour235,bg=colour246] #S #[fg=colour246,bg=colour237,nobold,nounderscore,noitalics]"
 set -g status-right "#[fg=colour239,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour246,bg=colour239] %Y-%m-%d  %H:%M #[fg=colour246,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour246] #h "
 setw -g window-status-format "#[fg=colour246,bg=colour237] #I #[fg=colour246,bg=colour237] #W "