updated

UltiSnips/python.snippets

@@ -3,3 +3,7 @@ snippet #! "Shebang"
 
 $0
 endsnippet
+
+snippet pylint "pylint-disable"
+# pylint: disable=$0
+endsnippet

autoload/plug.vim

@@ -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
@@ -1011,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
@@ -1102,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
@@ -1321,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
@@ -2410,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)')))

vimrc

@@ -14,8 +14,16 @@ call plug#begin('~/.vim/bundle')
 if !exists("g:gui_oni")
   " As-you-type semantic completion.
   " Plug 'Valloric/YouCompleteMe', { 'on': ['YcmCompleter', 'YcmDiags', 'YcmForceCompileAndDiagnostics'], 'do': './install.py'}
-  Plug 'Valloric/YouCompleteMe', { 'do': 'python3 ./install.py --go-completer'}
-  autocmd! User YouCompleteMe if !has('vim_starting') | call youcompleteme#Enable() | endif
+  " Plug 'Valloric/YouCompleteMe', { 'do': 'python3 ./install.py'}
+  " autocmd! User YouCompleteMe if !has('vim_starting') | call youcompleteme#Enable() | endif
+  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+  let g:deoplete#enable_at_startup = 1
+  Plug 'davidhalter/jedi-vim'
+  Plug 'zchee/deoplete-jedi'
+  Plug 'zchee/deoplete-go', { 'do': 'make'}
+  let g:deoplete#sources#go#gocode_binary = '/home/william/go/bin/gocode'
+  Plug 'Shougo/neco-vim'
+
   " Matching things in insert mode
   Plug 'Raimondi/delimitMate'
   " Make vim priiiiity
@@ -60,7 +68,7 @@ Plug 'janko-m/vim-test'
 " Plug 'Lokaltog/vim-easymotion'
 Plug 'justinmk/vim-sneak'
 " Allows multiple cursors at once.  very useful
-Plug 'wreed4/vim-multiple-cursors'
+" Plug 'wreed4/vim-multiple-cursors'
 " Dependency for vim-snippets
 Plug 'tomtom/tlib_vim'
 " A library of snippets that work with Utilsnip
@@ -135,6 +143,7 @@ Plug 'apalmer1377/factorus'
 Plug 'stephpy/vim-yaml'
 Plug 'solarnz/thrift.vim'
 Plug 'martinda/Jenkinsfile-vim-syntax'
+Plug 'mustache/vim-mustache-handlebars'
 
 "COLORSCHEMES
 " about 3 billion colorschemes
@@ -295,50 +304,52 @@ let g:UltiSnipsSnippetsDir="~/.vim/UltiSnips"
 
 " }}}
 " {{{##### YouCompleteMe #####
-" Do not open preview window when completing
-" set completeopt=menuone
-" let g:ycm_add_preview_to_completeopt = 0
-" Auto Close preview window
-let g:ycm_autoclose_preview_window_after_insertion = 1
-" Disable Tab for cycling through commands so that UtilSnips will still work
-let g:ycm_key_list_select_completion=['<Down>']
-let g:ycm_key_list_previous_completion=['<Up>']
-let g:ycm_collect_identifiers_from_tags_files=0
-let g:ycm_collect_identifiers_from_comments_and_strings = 0
-let g:ycm_complete_in_comments = 1
-let g:ycm_key_invoke_completion = '<C-N>'
-"let g:ycm_extra_conf_globlist = ['~/.ycm_extra_conf.py']
-let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
-let g:ycm_use_ultisnips_completer = 1
-let g:ycm_filetype_blacklist = {
-            \ 'tagbar' : 1,
-            \ 'nerdtree': 1,
-            \ 'qf' : 1,
-            \ 'notes' : 1,
-            \ 'unite' : 1,
-            \ 'vimwiki' : 1,
-            \ 'pandoc' : 1,
-            \ 'infolog' : 1,
-            \ 'mail' : 1
-            \}
-
-" Python3 completion by default
-" let g:ycm_python_binary_path = system('readlink -f ' . system('which python3'))
-let g:ycm_python_binary_path = 'python3'
-let g:ycm_server_keep_logfile=1
-
-" Mappings
-nnoremap <leader>] :YcmCompleter GoTo<CR>
-nnoremap <leader>[ :YcmCompleter GoToReferences<CR>
-nnoremap <leader>gt :YcmCompleter GetType<CR>
-nnoremap <leader>gp :YcmCompleter GetParent<CR>
-nnoremap <leader>gd :YcmCompleter GetDoc<CR>
-nnoremap <leader>= :YcmCompleter FixIt<CR>
-
-nnoremap <silent> <F1> :YcmDiags<CR>
-nnoremap <silent> <leader><F1> :YcmForceCompileAndDiagnostics<CR>
+"" Do not open preview window when completing
+"" set completeopt=menuone
+"" let g:ycm_add_preview_to_completeopt = 0
+"" Auto Close preview window
+"let g:ycm_autoclose_preview_window_after_insertion = 1
+"" Disable Tab for cycling through commands so that UtilSnips will still work
+"let g:ycm_key_list_select_completion=['<Down>']
+"let g:ycm_key_list_previous_completion=['<Up>']
+"let g:ycm_collect_identifiers_from_tags_files=0
+"let g:ycm_collect_identifiers_from_comments_and_strings = 0
+"let g:ycm_complete_in_comments = 1
+"let g:ycm_key_invoke_completion = '<C-N>'
+""let g:ycm_extra_conf_globlist = ['~/.ycm_extra_conf.py']
+"let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+"let g:ycm_use_ultisnips_completer = 1
+"let g:ycm_filetype_blacklist = {
+"            \ 'tagbar' : 1,
+"            \ 'nerdtree': 1,
+"            \ 'qf' : 1,
+"            \ 'notes' : 1,
+"            \ 'unite' : 1,
+"            \ 'vimwiki' : 1,
+"            \ 'pandoc' : 1,
+"            \ 'infolog' : 1,
+"            \ 'mail' : 1
+"            \}
+
+"" Python3 completion by default
+"" let g:ycm_python_binary_path = system('readlink -f ' . system('which python3'))
+"let g:ycm_python_binary_path = 'python3'
+"let g:ycm_server_keep_logfile=1
+
+"" Mappings
+"nnoremap <leader>] :YcmCompleter GoTo<CR>
+"nnoremap <leader>[ :YcmCompleter GoToReferences<CR>
+"nnoremap <leader>gt :YcmCompleter GetType<CR>
+"nnoremap <leader>gp :YcmCompleter GetParent<CR>
+"nnoremap <leader>gd :YcmCompleter GetDoc<CR>
+"nnoremap <leader>= :YcmCompleter FixIt<CR>
+
+"nnoremap <silent> <F1> :YcmDiags<CR>
+"nnoremap <silent> <leader><F1> :YcmForceCompileAndDiagnostics<CR>
 
 
+" }}}
+" {{{##### Deoplete #####
 " }}}
 " {{{##### Multiple Cursors #####
 let g:multi_cursor_exit_from_insert_mode = 0
@@ -373,6 +384,21 @@ command! -nargs=* -complete=dir Cd call fzf#run(fzf#wrap(
   \ {'source': 'find '.(empty([<f-args>]) ? '.' : expand(<f-args>)).' -type d',
   \  'sink': 'cd'}))
 
+function! s:delete_items(lines)
+  echo type(a:lines)
+  sleep 3
+endfunction
+
+command! -nargs=* -bang BufferDelete 
+  \ call fzf#vim#buffers(<q-args>, {'sink': function('s:delete_items')}, <bang>0)
+
+
+let g:fzf_action = {
+  \ 'ctrl-q': function('s:delete_items'),
+  \ 'ctrl-t': 'tab split',
+  \ 'ctrl-x': 'split',
+  \ 'ctrl-v': 'vsplit' }
+
 nnoremap <leader>cd :Cd ~<CR>
 nnoremap <leader><leader>cd :Cd 
 nnoremap <leader>e :Files<CR>
@@ -527,6 +553,27 @@ nvimux.bootstrap()
 EOF
 endif
 
+" }}}
+" {{{ ##### vim-fugitive #####
+augroup rebase_tools
+  autocmd!
+  autocmd FileType gitrebase nnoremap <buffer> <leader>] :Gedit <c-r><c-w><CR>
+  autocmd FileType gitrebase nnoremap <buffer> <leader>p :Pick <CR>
+  autocmd FileType gitrebase nnoremap <buffer> <leader>r :Reword <CR>
+  autocmd FileType gitrebase nnoremap <buffer> <leader>e :Edit <CR>
+  autocmd FileType gitrebase nnoremap <buffer> <leader>sq :Squash <CR>
+  autocmd FileType gitrebase nnoremap <buffer> <leader>f :Fixup <CR>
+augroup END
+
+command! Jenkins execute 'Gcommit -a --fixup=HEAD' | Gpush
+" }}}
+" {{{ ##### Jedi #####
+let g:jedi#completions_enabled = 0
+let g:jedi#goto_command = "<leader>]"
+" }}}
+" {{{ ##### vim-go #####
+let g:go_def_mapping_enabled = 0
+autocmd FileType go nmap <leader>] :GoDef<CR>
 " }}}
 
 " }}}
@@ -886,7 +933,7 @@ nnoremap <leader>q :<c-u><c-r><c-r>='let @q = '. string(getreg('q'))<cr><c-f><le
 
 " go back and delete last buffer (dangerous if the going back doesn't bring
 " you to another buffer
-nnoremap <M-C-O> <C-o>:bd! #<CR>
+nnoremap <M-C-O> <C-^>:bd! #<CR>
 
 " toggle number
 nnoremap <silent> -- :set number!<CR>
@@ -900,9 +947,14 @@ inoremap <C-r>! <C-\><C-O>:let @r=system("")<left><left>
 " terminal escape
 " tnoremap <Esc><Esc> <C-\><C-N>
 
+nnoremap <silent> bn :bn<CR>
+nnoremap <silent> bp :bp<CR>
+
 " }}}
 
 "{{{ ***** COMMANDS ***** "
+" I caved
+command! W w
 
 " Terminal commands
 command! -nargs=0 VTerm vsplit term://bash