Added fugitive plugin

.gitignore

@@ -1,2 +1,4 @@
-bundle/*
 .netrwhist
+pack/plugins/start/*
+!pack/plugins/start/*.url
+%*

Makefile

@@ -1,20 +0,0 @@
-.PHONY: help update backup
-
-PLUGINS := $(wildcard bundle/*)
-LIST    := download-plugins.sh
-
-## Some local functions
-upd = $(shell git -C $1 pull)
-bak = $(shell echo "git clone $$(git -C $1 remote get-url origin) $1" >> $2)
-
-help: ## Display this message
-	@echo "Usage:"
-	@sed -nE "s|^(.+?)\\s*:\\s*##\\s*(.+)$$|\\tmake \\1\\t- \\2|p" \
-		$(lastword $(MAKEFILE_LIST))
-
-update: ## Update all bundled plugins
-	@echo $(foreach dir,$(PLUGINS),$(call upd,$(dir))) > /dev/null
-
-backup: ## Create backup list of bundled plugins
-	@echo $(foreach dir,$(PLUGINS),$(call bak,$(dir),$(LIST)))
-	@cat $(LIST)

autoload/pathogen.vim

@@ -1,264 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#interpose() or an absolute path to invoke pathogen#surround().
-" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all
-" subdirectories inside "bundle" inside all directories in the runtime path.
-" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
-" on versions of Vim without native package support.
-function! pathogen#infect(...) abort
-  if a:0
-    let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
-  else
-    let paths = ['bundle/{}', 'pack/{}/start/{}']
-  endif
-  if has('packages')
-    call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
-  endif
-  let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
-  for path in filter(copy(paths), 'v:val =~# static')
-    call pathogen#surround(path)
-  endfor
-  for path in filter(copy(paths), 'v:val !~# static')
-    if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
-      call pathogen#surround(path)
-    else
-      call pathogen#interpose(path)
-    endif
-  endfor
-  call pathogen#cycle_filetype()
-  if pathogen#is_disabled($MYVIMRC)
-    return 'finish'
-  endif
-  return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
-  if type(a:path) == type([]) | return a:path | endif
-  if empty(a:path) | return [] | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction
-
-" Convert a list to a path.
-function! pathogen#join(...) abort
-  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
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort
-  return call('pathogen#join',[1] + a:000)
-endfunction
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() abort
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction
-
-" Check if a bundle is disabled.  A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
-  if a:path =~# '\~$'
-    return 1
-  endif
-  let sep = pathogen#slash()
-  let blacklist = get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + pathogen#split($VIMBLACKLIST)
-  if !empty(blacklist)
-    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
-  endif
-  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  Curly braces are expanded with pathogen#expand().
-function! pathogen#surround(path) abort
-  let sep = pathogen#slash()
-  let rtp = pathogen#split(&rtp)
-  let path = fnamemodify(a:path, ':s?[\\/]\=$??')
-  let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
-  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
-  call filter(rtp, 'index(before + after, v:val) == -1')
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  Curly braces are expanded with pathogen#expand().
-function! pathogen#interpose(name) abort
-  let sep = pathogen#slash()
-  let name = a:name
-  if has_key(s:done_bundles, name)
-    return ""
-  endif
-  let s:done_bundles[name] = 1
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
-    else
-      let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction
-
-let s:done_bundles = {}
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort
-  let sep = pathogen#slash()
-  for glob in pathogen#split(&rtp)
-    for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
-      if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
-        silent! execute 'helptags' pathogen#fnameescape(dir)
-      endif
-    endfor
-  endfor
-endfunction
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction
-
-" Section: Unofficial
-
-function! pathogen#is_absolute(path) abort
-  return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
-endfunction
-
-" Given a string, returns all possible permutations of comma delimited braced
-" alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
-" ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
-" and globbed.  Actual globs are preserved.
-function! pathogen#expand(pattern, ...) abort
-  let after = a:0 ? a:1 : ''
-  let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
-  if pattern =~# '{[^{}]\+}'
-    let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
-    let found = map(split(pat, ',', 1), 'pre.v:val.post')
-    let results = []
-    for pattern in found
-      call extend(results, pathogen#expand(pattern))
-    endfor
-  elseif pattern =~# '{}'
-    let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
-    let post = pattern[strlen(pat) : -1]
-    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
-  else
-    let results = [pattern]
-  endif
-  let vf = pathogen#slash() . 'vimfiles'
-  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
-  return filter(results, '!empty(v:val)')
-endfunction
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#slash() abort
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction
-
-function! pathogen#separator() abort
-  return pathogen#slash()
-endfunction
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort
-  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
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
-  else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
-  endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
-  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
-
-" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':

bundle/bundles.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2016
-usage() {
-  cat << EOT
-Usage:
-  ./${0##*/} ls|update|clone|save
-
-Commands:
-  ls     -> List all the bundle repos
-  update -> Update all the bundle repos
-  clone  -> Use 'bundles.txt' to repopulate
-  save   -> Save repos to 'bundles.txt'
-EOT
-  exit
-}
-
-colors() {
-  sed -E -e 's/\[red\]//g' \
-         -e 's/\[green\]//g' \
-         -e 's/\[reset\]//g' \
-         -e 's/\[b\]//g' \
-         -e 's/\[ul\]//g'
-}
-
-repos() {
-  # Eval "$1" for all directories
-  local dn
-  for dn in * ; do
-    [[ -d "$dn" && -d "$dn/.git" ]] || continue
-    eval "${1//@@/$dn}" | colors
-  done
-}
-
-clone_bundles() {
-  # Clone the bundles in 'bundles.txt'
-  local dn repo
-  while read -r dn repo ; do
-    if [[ -d "$dn" ]]; then
-      echo "*** Dir [red][$dn][reset] already exists!" | colors
-    else
-      git clone "$repo" "$dn" 2>&1 | sed "s|^|[green][$dn][reset] |g" | colors
-    fi
-  done < bundles.txt
-}
-
-case "$1" in
-      ls) repos 'echo -e "[red]@@[reset] [green]$(git -C @@ remote get-url origin)[reset]"' ;;
-  update) repos 'git -C @@ pull 2>&1 | sed "s|^|[green][@@][reset] |g"' ;;
-    save) repos 'echo -e "@@ $(git -C @@ remote get-url origin)"' | tee bundles.txt ;;
-   clone) clone_bundles ;;
-      ?*) echo "Unknown command: $1" ;;
-       *) usage ;;
-esac
-
-# Fin.

bundle/bundles.txt

@@ -1,13 +0,0 @@
-dockerfile-syntax https://github.com/ekalinin/Dockerfile.vim.git
-fugitive https://github.com/tpope/vim-fugitive.git
-nerdtree-git https://github.com/Xuyuanp/nerdtree-git-plugin.git
-nerdtree https://github.com/preservim/nerdtree.git
-nim https://github.com/zah/nim.vim.git
-solarized https://github.com/altercation/vim-colors-solarized.git
-syntastic https://github.com/vim-syntastic/syntastic.git
-terraform https://github.com/hashivim/vim-terraform.git
-terragrunt https://github.com/yorinasub17/vim-terragrunt.git
-toml-syntax https://github.com/cespare/vim-toml.git
-vcl-vim-plugin https://github.com/smerrill/vcl-vim-plugin
-vlang https://github.com/ollykel/v-vim.git
-zig https://github.com/ziglang/zig.vim.git

download-plugins.sh

@@ -1,9 +0,0 @@
-git clone git@github.com:zah/nim.vim.git bundle/nim
-git clone git@github.com:Xuyuanp/nerdtree-git-plugin.git bundle/nerdtree-git
-git clone git@github.com:ziglang/zig.vim.git bundle/zig
-git clone git@github.com:ekalinin/Dockerfile.vim.git bundle/dockerfile
-git clone git@github.com:altercation/vim-colors-solarized.git bundle/solarized
-git clone git@github.com:preservim/nerdtree.git bundle/nerdtree
-git clone git@github.com:tpope/vim-fugitive.git bundle/fugitive
-git clone git@github.com:vim-syntastic/syntastic.git bundle/syntastic
-git clone git@github.com:hashivim/vim-terraform.git bundle/terraform

pack/plugins/start/update.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+PLUGINS='
+https://github.com/preservim/nerdtree
+https://github.com/SirVer/ultisnips
+https://github.com/jreybert/vimagit
+https://github.com/vim-airline/vim-airline
+https://github.com/altercation/vim-colors-solarized
+https://github.com/tpope/vim-dadbod.git
+https://github.com/airblade/vim-gitgutter
+https://github.com/sheerun/vim-polyglot
+https://github.com/honza/vim-snippets
+https://tpope.io/vim/fugitive.git
+'
+
+z=$'\e[0m'
+red=$'\e[31m'
+green=$'\e[32m'
+
+show() {
+  local c="${green}" l
+  [[ $2 -eq  0 ]] || c="${red}"
+  echo "*** $1"
+  while read -r l; do
+    echo "${c}|${z} $l"
+  done <<< "$3"
+  echo ""
+}
+
+gitit() {
+  local cmd url dir txt rc
+  while read -r url; do
+    dir=${url##*/}
+    [[ ${dir} != *.git ]] || dir=${dir%.git}
+    cmd="git -C ${dir} pull --prune 2>&1"
+    [[ -d ${dir} ]] || cmd="git clone --depth 1 ${url} ${dir} 2>&1"
+    out="$(eval "$cmd")"
+    show "$url" $? "$out"
+  done
+}
+
+echo "$PLUGINS" \
+  | grep -Ev '^#' \
+  | grep -Ev '^\s*$' \
+  | gitit
+
+# Fin

vimrc

@@ -1,19 +1,21 @@
-execute pathogen#infect()
 filetype plugin indent on
 set modeline
 set background=dark
 set shell=/bin/bash
 set splitbelow
+set splitright
 syntax on
 
 if has('gui_running')
-  set gfn=DejaVu\ Sans\ Mono\ 16
-  colorscheme torte
+  set gfn=CommitMono\ Regular\ 16
+  colorscheme solarized
+  let g:solarized_menu=0
 else
   colorscheme torte
 endif
 
 autocmd StdinReadPre * let s:std_in=1
+
 autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif
 set ai et nu ts=2 sw=2 wm=0 tabpagemax=100
 
@@ -29,3 +31,6 @@ func! WordProcessor()
   set complete+=s
 endfu
 com! WP call WordProcessor()
+
+" enable packloadall for pack plugins
+packloadall