Migrated to vim-plug

21 files changed, 46 insertions, 417 deletions

diff --git a/.gitignore b/.gitignore
index 2ad9359..1560e33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .netrwhist
 .tags
+plugged/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ec35967..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,45 +0,0 @@
-[submodule "bundle/syntastic"]
-	path = bundle/syntastic
-	url = https://github.com/scrooloose/syntastic.git
-[submodule "bundle/vim-autoformat"]
-	path = bundle/vim-autoformat
-	url = https://github.com/Chiel92/vim-autoformat
-[submodule "bundle/vim-go"]
-	path = bundle/vim-go
-	url = https://github.com/fatih/vim-go.git
-[submodule "bundle/fugitive"]
-	path = bundle/fugitive
-	url = https://github.com/tpope/vim-fugitive.git
-[submodule "bundle/nerdtree"]
-	path = bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree.git
-[submodule "bundle/tcomment_vim"]
-	path = bundle/tcomment_vim
-	url = https://github.com/tomtom/tcomment_vim
-[submodule "bundle/vim-gitgutter"]
-	path = bundle/vim-gitgutter
-	url = git://github.com/airblade/vim-gitgutter.git
-[submodule "bundle/vim-z80"]
-	path = bundle/vim-z80
-	url = https://github.com/samsaga2/vim-z80.git
-[submodule "bundle/vim-tmux-focus-events"]
-	path = bundle/vim-tmux-focus-events
-	url = https://github.com/tmux-plugins/vim-tmux-focus-events.git
-[submodule "bundle/vim-tmux-clipboard"]
-	path = bundle/vim-tmux-clipboard
-	url = https://github.com/roxma/vim-tmux-clipboard.git
-[submodule "bundle/gen_tags.vim"]
-	path = bundle/gen_tags.vim
-	url = https://github.com/jsfaint/gen_tags.vim.git
-[submodule "bundle/terminus"]
-	path = bundle/terminus
-	url = https://github.com/wincent/terminus
-[submodule "bundle/vim-bufkill"]
-	path = bundle/vim-bufkill
-	url = https://github.com/qpkorr/vim-bufkill
-[submodule "bundle/gruvbox-community"]
-	path = bundle/gruvbox-community
-	url = https://github.com/gruvbox-community/gruvbox.git
-[submodule "bundle/vim-lsc"]
-	path = bundle/vim-lsc
-	url = https://github.com/natebosch/vim-lsc.git
diff --git a/README.md b/README.md
index ebcfa28..2003352 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,7 @@
 # My ~/.vim
 
-I borrowed from different sources, one of them being this:
-
-https://gist.github.com/manasthakur/d4dc9a610884c60d944a4dd97f0b3560
-
-Few differences:
-
- - My repo is in `~/.vim/`
- - I use pathogen to manage the plugins (should move to Vim 8's packages, but I
-   still have few Vim 7.x boxes)
- - Includes gvim configuration (outdated, I don't use it anymore)
+Managed by [vim-plug](https://github.com/junegunn/vim-plug) and compatible with
+Neovim.
 
 For further information on installed plugins:
 
@@ -17,7 +9,7 @@ For further information on installed plugins:
 
 ## Using it in a new location
 
-You shouldn't have a `~/.vimrc` or `~/.vim` directory.
+My repo is in `~/.vim/`! You shouldn't have a `~/.vimrc` or `~/.vim` directory.
 
     cd && git clone --recursive https://github.com/reidrac/dotvim.git .vim
 
@@ -28,29 +20,27 @@ If you're not using vim 8; create a `.vimrc` with:
 This can be also be used to customise your local vim configuration without
 having uncommitted changes in your repository.
 
-## Adding plugins
+In case of Neovim, you can link the provided `init.vim` into `~/.config/nvim/init.vim`.
 
-    git submodule add https://github.com/user/foo.git bundle/foo
-    git commit -m "Added foo plugin"
+Then it is recommended you run:
 
-## Updating plugins
+    :PlugUpgrade
+    :PlugInstall
 
-    git submodule foreach git pull origin master
-    git commit -am "Updated plugins"
+The *upgrade* part is only needed if the plugin manager is not up to date. Then
+you can commit and push the updated version.
 
-### Updating you .vim on a different machine
+## Adding plugins
 
-    git pull
+Add a new `Plug` entry in `~/.vim/vimrc`.
 
-    # Only if a plugin was added
-    git submodule init
+## Updating plugins
 
-    git submodule update
+    :PlugUpdate
 
 ## Removing plugins
 
-    git submodule deinit -f bundle/foo
-    git rm -r bundle/foo
-    git commit -am "Removed plugin"
-    rm -rf .git/modules/bundle/foo
+Remove the `Plug` line and run:
+
+    :PlugClean
 
diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim
deleted file mode 100644
index 16c21fe..0000000
--- a/autoload/pathogen.vim
+++ /dev/null
@@ -1,328 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.2
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `call pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.  For maximum ease of reading,
-" :set foldmethod=marker
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-function! s:warn(msg)
-  if &verbose
-    echohl WarningMsg
-    echomsg a:msg
-    echohl NONE
-  endif
-endfunction
-
-" Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround().  For backwards compatibility purposes, a full path that
-" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
-" instead.
-function! pathogen#infect(...) abort " {{{1
-  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
-    if path =~# '^[^\\/]\+$'
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#incubate(path . '/{}')
-    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
-      call pathogen#incubate(path)
-    elseif path =~# '[\\/]\%({}\|\*\)$'
-      call pathogen#surround(path)
-    else
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#surround(path . '/{}')
-    endif
-  endfor
-  call pathogen#cycle_filetype()
-  return ''
-endfunction " }}}1
-
-" Split a path into a list.
-function! pathogen#split(path) abort " {{{1
-  if type(a:path) == type([]) | return a:path | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction " }}}1
-
-" Convert a list to a path.
-function! pathogen#join(...) abort " {{{1
-  if type(a:1) == type(1) && a:1
-    let i = 1
-    let space = ' '
-  else
-    let i = 0
-    let space = ''
-  endif
-  let path = ""
-  while i < a:0
-    if type(a:000[i]) == type([])
-      let list = a:000[i]
-      let j = 0
-      while j < len(list)
-        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
-        let path .= ',' . escaped
-        let j += 1
-      endwhile
-    else
-      let path .= "," . a:000[i]
-    endif
-    let i += 1
-  endwhile
-  return substitute(path,'^,','','')
-endfunction " }}}1
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort " {{{1
-  return call('pathogen#join',[1] + a:000)
-endfunction " }}}1
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort " {{{1
-  let i = 0
-  let seen = {}
-  while i < len(a:list)
-    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
-      call remove(a:list,i)
-    elseif a:list[i] ==# ''
-      let i += 1
-      let empty = 1
-    else
-      let seen[a:list[i]] = 1
-      let i += 1
-    endif
-  endwhile
-  return a:list
-endfunction " }}}1
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#separator() abort " {{{1
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction " }}}1
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort " {{{1
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
-endfunction "}}}1
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort " {{{1
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() " {{{1
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction " }}}1
-
-" Check if a bundle is disabled.  A bundle is considered disabled if it ends
-" in a tilde or its basename or full name is included in the list
-" g:pathogen_disabled.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  let blacklist = g:pathogen_disabled
-  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
-endfunction "}}}1
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  If the directory is already included, move it to the
-" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
-" all subdirectories to be added (except those in g:pathogen_disabled).
-function! pathogen#surround(path) abort " {{{1
-  let sep = pathogen#separator()
-  let rtp = pathogen#split(&rtp)
-  if a:path =~# '[\\/]{}$'
-    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
-    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
-    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
-    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  else
-    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
-    let before = [path]
-    let after = [path . sep . 'after']
-    call filter(rtp, 'index(before + after, v:val) == -1')
-  endif
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction " }}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.  Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
-  return pathogen#surround(a:path . pathogen#separator() . '{}')
-endfunction " }}}1
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  If the argument ends in '/{}', add a separate entry for
-" each subdirectory.  The default argument is 'bundle/{}', which means that
-" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
-" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
-" UNIX).
-function! pathogen#incubate(...) abort " {{{1
-  let sep = pathogen#separator()
-  let name = a:0 ? a:1 : 'bundle/{}'
-  if "\n".s:done_bundles =~# "\\M\n".name."\n"
-    return ""
-  endif
-  let s:done_bundles .= name . "\n"
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      if name =~# '{}$'
-        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-      else
-        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
-      endif
-    else
-      if name =~# '{}$'
-        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*[^~]'), '!pathogen#is_disabled(v:val)')
-      else
-        let list += [dir . sep . name, dir]
-      endif
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction " }}}1
-
-" Deprecated alias for pathogen#incubate().
-function! pathogen#runtime_append_all_bundles(...) abort " {{{1
-  if a:0
-    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
-  else
-    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
-  endif
-  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
-endfunction
-
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort " {{{1
-  let sep = pathogen#separator()
-  for glob in pathogen#split(&rtp)
-    for dir in split(glob(glob), "\n")
-      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
-        helptags `=dir.'/doc'`
-      endif
-    endfor
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort " {{{1
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction " }}}1
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort "{{{1
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  let file = findfile(a:file,rtp,a:count)
-  if file ==# ''
-    return ''
-  else
-    return fnamemodify(file,':p')
-  endif
-endfunction " }}}1
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort " {{{1
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
-  else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
-  endif
-endfunction " }}}1
-
-if exists(':Vedit')
-  finish
-endif
-
-let s:vopen_warning = 0
-
-function! s:find(count,cmd,file,lcd) " {{{1
-  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
-  let file = pathogen#runtime_findfile(a:file,a:count)
-  if file ==# ''
-    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  endif
-  if !s:vopen_warning
-    let s:vopen_warning = 1
-    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
-  else
-    let warning = ''
-  endif
-  if a:lcd
-    let path = file[0:-strlen(a:file)-2]
-    execute 'lcd `=path`'
-    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
-  else
-    return a:cmd.' '.pathogen#fnameescape(file) . warning
-  endif
-endfunction " }}}1
-
-function! s:Findcomplete(A,L,P) " {{{1
-  let sep = pathogen#separator()
-  let cheats = {
-        \'a': 'autoload',
-        \'d': 'doc',
-        \'f': 'ftplugin',
-        \'i': 'indent',
-        \'p': 'plugin',
-        \'s': 'syntax'}
-  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
-    let request = cheats[a:A[0]].a:A[1:-1]
-  else
-    let request = a:A
-  endif
-  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
-  let found = {}
-  for path in pathogen#split(&runtimepath)
-    let path = expand(path, ':p')
-    let matches = split(glob(path.sep.pattern),"\n")
-    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
-    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
-    for match in matches
-      let found[match] = 1
-    endfor
-  endfor
-  return sort(keys(found))
-endfunction " }}}1
-
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
-
-" vim:set et sw=2:
diff --git a/bundle/fugitive b/bundle/fugitive
deleted file mode 160000
-Subproject 06e34204af04643d96d30132de6ba9066368de1
diff --git a/bundle/gen_tags.vim b/bundle/gen_tags.vim
deleted file mode 160000
-Subproject 208cd0490547bc8f7615eea1b26e4635d2e60a9
diff --git a/bundle/gruvbox-community b/bundle/gruvbox-community
deleted file mode 160000
-Subproject 290d103d944c1527c612e350b5a8693b7063bec
diff --git a/bundle/nerdtree b/bundle/nerdtree
deleted file mode 160000
-Subproject ee79ecfb67e4403e54ea59c175ca4d39544395e
diff --git a/bundle/syntastic b/bundle/syntastic
deleted file mode 160000
-Subproject 3b3f4ee8abf81191d1eca4350448148b86e8a74
diff --git a/bundle/tcomment_vim b/bundle/tcomment_vim
deleted file mode 160000
-Subproject c9cecefc639b6019e0f12b7e9fb5a2375cd550c
diff --git a/bundle/terminus b/bundle/terminus
deleted file mode 160000
-Subproject 0c826f1eb31f68648fa82cb25ed06031dc846a4
diff --git a/bundle/vim-autoformat b/bundle/vim-autoformat
deleted file mode 160000
-Subproject a350538f8a5a8f08cf64a520d456282080c3968
diff --git a/bundle/vim-bufkill b/bundle/vim-bufkill
deleted file mode 160000
-Subproject 795dd38f3cff69d0d8fe9e71847907e20086095
diff --git a/bundle/vim-gitgutter b/bundle/vim-gitgutter
deleted file mode 160000
-Subproject 320b7a33e78b22c05d25186fbeea85320162763
diff --git a/bundle/vim-go b/bundle/vim-go
deleted file mode 160000
-Subproject 17c53d38f17b0978323868ac12573f33a6fb810
diff --git a/bundle/vim-lsc b/bundle/vim-lsc
deleted file mode 160000
-Subproject 2384903e1dd6314934f58e3c88b10924dd1bf4f
diff --git a/bundle/vim-tmux-clipboard b/bundle/vim-tmux-clipboard
deleted file mode 160000
-Subproject 47187740b88f9dab213f44678800cc797223808
diff --git a/bundle/vim-tmux-focus-events b/bundle/vim-tmux-focus-events
deleted file mode 160000
-Subproject 0f89b1ada151e22882a5a47a1ee2b6d6135bc5c
diff --git a/bundle/vim-z80 b/bundle/vim-z80
deleted file mode 160000
-Subproject 85892d8411aa9745d934a55dec85735fd2edc2c
diff --git a/gvimrc b/gvimrc
deleted file mode 100644
index 49ffd91..0000000
--- a/gvimrc
+++ /dev/null
@@ -1,14 +0,0 @@
-" Tab headings 
-set gtl=%t gtt=%F
-
-" disable guff
-set guioptions-=Tm
-set guioptions=cLrA
-
-set guifont=Inconsolata\ Medium\ 12
-
-set guicursor+=i:ver100-Cursor/iCursor
-set guicursor+=i:blinkon0
-
-highlight Cursor guifg=black guibg=orange
-
diff --git a/vimrc b/vimrc
index a389486..91dc081 100644
--- a/vimrc
+++ b/vimrc
@@ -31,6 +31,34 @@ set laststatus=2
 " enable mouse
 set mouse=a
 
+" plugin dependent conf starts
+
+call plug#begin('~/.vim/plugged')
+
+" git
+Plug 'tpope/vim-fugitive.git'
+Plug 'airblade/vim-gitgutter.git'
+
+" tmux
+Plug 'tmux-plugins/vim-tmux-focus-events.git'
+Plug 'roxma/vim-tmux-clipboard.git'
+Plug 'wincent/terminus'
+
+" life improvements
+Plug 'gruvbox-community/gruvbox.git'
+Plug 'scrooloose/nerdtree.git'
+Plug 'qpkorr/vim-bufkill'
+Plug 'Chiel92/vim-autoformat'
+Plug 'jsfaint/gen_tags.vim.git'
+
+" language support
+Plug 'fatih/vim-go.git'
+Plug 'natebosch/vim-lsc.git'
+Plug 'samsaga2/vim-z80.git'
+Plug 'scrooloose/syntastic.git'
+
+call plug#end()
+
 set statusline =
 " Buffer number
 set statusline +=[%n]
@@ -66,10 +94,7 @@ noremap <F29> :Autoformat<CR>
 " enable omnicompletion
 set omnifunc=syntaxcomplete#Complete
 
-call pathogen#infect()
-call pathogen#helptags()
-
-" looks nice; apparently needs to go after pathogen
+" looks nice
 set termguicolors
 set background=dark
 let g:gruvbox_italic=1