From eff4b43f765e02c35f8198a6c63ba39fc3b92aae Mon Sep 17 00:00:00 2001
From: Corrado Primier <cp@corradoprimier.it>
Date: Sat, 29 Dec 2018 17:37:20 +0000
Subject: [PATCH] Migrate to vim 8 plugin system

---
 .gitignore                                    |  1 +
 .gitmodules                                   | 42 +++++++++++++++++++
 .vim/pack/bardo/start/Dockerfile.vim          |  1 +
 .vim/pack/bardo/start/Indent-Guides           |  1 +
 .vim/pack/bardo/start/ale                     |  1 +
 .vim/pack/bardo/start/base16-vim              |  1 +
 .vim/pack/bardo/start/black                   |  1 +
 .vim/pack/bardo/start/python-mode             |  1 +
 .vim/pack/bardo/start/vim-airline             |  1 +
 .vim/pack/bardo/start/vim-airline-themes      |  1 +
 .vim/pack/bardo/start/vim-commentary          |  1 +
 .vim/pack/bardo/start/vim-fugitive            |  1 +
 .vim/pack/bardo/start/vim-markdown            |  1 +
 .vim/pack/bardo/start/vim-python-pep8-indent  |  1 +
 .vim/pack/bardo/start/vim-tmux                |  1 +
 .vim/pack/bardo/start/vim-trailing-whitespace |  1 +
 .vimrc                                        | 25 -----------
 bin/bootstrap.sh                              | 13 ------
 bin/scriptamanent                             | 26 ++++++++++++
 bin/update-vim-plugins                        |  5 +++
 20 files changed, 88 insertions(+), 38 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .gitmodules
 create mode 160000 .vim/pack/bardo/start/Dockerfile.vim
 create mode 160000 .vim/pack/bardo/start/Indent-Guides
 create mode 160000 .vim/pack/bardo/start/ale
 create mode 160000 .vim/pack/bardo/start/base16-vim
 create mode 160000 .vim/pack/bardo/start/black
 create mode 160000 .vim/pack/bardo/start/python-mode
 create mode 160000 .vim/pack/bardo/start/vim-airline
 create mode 160000 .vim/pack/bardo/start/vim-airline-themes
 create mode 160000 .vim/pack/bardo/start/vim-commentary
 create mode 160000 .vim/pack/bardo/start/vim-fugitive
 create mode 160000 .vim/pack/bardo/start/vim-markdown
 create mode 160000 .vim/pack/bardo/start/vim-python-pep8-indent
 create mode 160000 .vim/pack/bardo/start/vim-tmux
 create mode 160000 .vim/pack/bardo/start/vim-trailing-whitespace
 delete mode 100755 bin/bootstrap.sh
 create mode 100755 bin/scriptamanent
 create mode 100755 bin/update-vim-plugins

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6747ae5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.vim/black/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..025b8d5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,42 @@
+[submodule ".vim/pack/bardo/start/Indent-Guides"]
+	path = .vim/pack/bardo/start/Indent-Guides
+	url = https://github.com/vim-scripts/Indent-Guides.git
+[submodule ".vim/pack/bardo/start/black"]
+	path = .vim/pack/bardo/start/black
+	url = https://github.com/ambv/black.git
+[submodule ".vim/pack/bardo/start/vim-trailing-whitespace"]
+	path = .vim/pack/bardo/start/vim-trailing-whitespace
+	url = https://github.com/bronson/vim-trailing-whitespace.git
+[submodule ".vim/pack/bardo/start/base16-vim"]
+	path = .vim/pack/bardo/start/base16-vim
+	url = https://github.com/chriskempson/base16-vim.git
+[submodule ".vim/pack/bardo/start/Dockerfile.vim"]
+	path = .vim/pack/bardo/start/Dockerfile.vim
+	url = https://github.com/ekalinin/Dockerfile.vim.git
+[submodule ".vim/pack/bardo/start/vim-python-pep8-indent"]
+	path = .vim/pack/bardo/start/vim-python-pep8-indent
+	url = https://github.com/hynek/vim-python-pep8-indent.git
+[submodule ".vim/pack/bardo/start/python-mode"]
+	path = .vim/pack/bardo/start/python-mode
+	url = https://github.com/python-mode/python-mode.git
+[submodule ".vim/pack/bardo/start/vim-commentary"]
+	path = .vim/pack/bardo/start/vim-commentary
+	url = https://github.com/tpope/vim-commentary.git
+[submodule ".vim/pack/bardo/start/vim-fugitive"]
+	path = .vim/pack/bardo/start/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+[submodule ".vim/pack/bardo/start/vim-markdown"]
+	path = .vim/pack/bardo/start/vim-markdown
+	url = https://github.com/tpope/vim-markdown.git
+[submodule ".vim/pack/bardo/start/vim-tmux"]
+	path = .vim/pack/bardo/start/vim-tmux
+	url = https://github.com/tmux-plugins/vim-tmux.git
+[submodule ".vim/pack/bardo/start/vim-airline"]
+	path = .vim/pack/bardo/start/vim-airline
+	url = https://github.com/vim-airline/vim-airline.git
+[submodule ".vim/pack/bardo/start/vim-airline-themes"]
+	path = .vim/pack/bardo/start/vim-airline-themes
+	url = https://github.com/vim-airline/vim-airline-themes.git
+[submodule ".vim/pack/bardo/start/ale"]
+	path = .vim/pack/bardo/start/ale
+	url = https://github.com/w0rp/ale.git
diff --git a/.vim/pack/bardo/start/Dockerfile.vim b/.vim/pack/bardo/start/Dockerfile.vim
new file mode 160000
index 0000000..4e31ae2
--- /dev/null
+++ b/.vim/pack/bardo/start/Dockerfile.vim
@@ -0,0 +1 @@
+Subproject commit 4e31ae28d462987ee6ae4aadb403aa8774dadb4d
diff --git a/.vim/pack/bardo/start/Indent-Guides b/.vim/pack/bardo/start/Indent-Guides
new file mode 160000
index 0000000..fb32046
--- /dev/null
+++ b/.vim/pack/bardo/start/Indent-Guides
@@ -0,0 +1 @@
+Subproject commit fb32046d791f959a9ca4f904262d645ad13069cf
diff --git a/.vim/pack/bardo/start/ale b/.vim/pack/bardo/start/ale
new file mode 160000
index 0000000..73ca1e7
--- /dev/null
+++ b/.vim/pack/bardo/start/ale
@@ -0,0 +1 @@
+Subproject commit 73ca1e71918a0b50b7bbcbed91857c3618ad93cc
diff --git a/.vim/pack/bardo/start/base16-vim b/.vim/pack/bardo/start/base16-vim
new file mode 160000
index 0000000..2073e2d
--- /dev/null
+++ b/.vim/pack/bardo/start/base16-vim
@@ -0,0 +1 @@
+Subproject commit 2073e2dd9fa0172ccdba92b3f0df25642a69f7db
diff --git a/.vim/pack/bardo/start/black b/.vim/pack/bardo/start/black
new file mode 160000
index 0000000..fe24a15
--- /dev/null
+++ b/.vim/pack/bardo/start/black
@@ -0,0 +1 @@
+Subproject commit fe24a15b84955130f23c8ab9490d1cdb98607b53
diff --git a/.vim/pack/bardo/start/python-mode b/.vim/pack/bardo/start/python-mode
new file mode 160000
index 0000000..f94b0d7
--- /dev/null
+++ b/.vim/pack/bardo/start/python-mode
@@ -0,0 +1 @@
+Subproject commit f94b0d7b21714f950f5878b430fbfde21c3b7ad9
diff --git a/.vim/pack/bardo/start/vim-airline b/.vim/pack/bardo/start/vim-airline
new file mode 160000
index 0000000..72888d8
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-airline
@@ -0,0 +1 @@
+Subproject commit 72888d87ea57761f21c9f67cd0c0faa5904795eb
diff --git a/.vim/pack/bardo/start/vim-airline-themes b/.vim/pack/bardo/start/vim-airline-themes
new file mode 160000
index 0000000..3bfe1d0
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-airline-themes
@@ -0,0 +1 @@
+Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9
diff --git a/.vim/pack/bardo/start/vim-commentary b/.vim/pack/bardo/start/vim-commentary
new file mode 160000
index 0000000..141d9d3
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-commentary
@@ -0,0 +1 @@
+Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
diff --git a/.vim/pack/bardo/start/vim-fugitive b/.vim/pack/bardo/start/vim-fugitive
new file mode 160000
index 0000000..b66141e
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit b66141e2523e03c3b71874fc2c7ae6989af7b335
diff --git a/.vim/pack/bardo/start/vim-markdown b/.vim/pack/bardo/start/vim-markdown
new file mode 160000
index 0000000..e2d7fcd
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-markdown
@@ -0,0 +1 @@
+Subproject commit e2d7fcd682a461a3951e8b5067cc8a0083e75e35
diff --git a/.vim/pack/bardo/start/vim-python-pep8-indent b/.vim/pack/bardo/start/vim-python-pep8-indent
new file mode 160000
index 0000000..62189f5
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-python-pep8-indent
@@ -0,0 +1 @@
+Subproject commit 62189f57e66400fcd1135bfaf6ca2eeb2d233e15
diff --git a/.vim/pack/bardo/start/vim-tmux b/.vim/pack/bardo/start/vim-tmux
new file mode 160000
index 0000000..b19923f
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-tmux
@@ -0,0 +1 @@
+Subproject commit b19923f7ab00bfcaeb252e0a452d49ebe2e49d6d
diff --git a/.vim/pack/bardo/start/vim-trailing-whitespace b/.vim/pack/bardo/start/vim-trailing-whitespace
new file mode 160000
index 0000000..4c59654
--- /dev/null
+++ b/.vim/pack/bardo/start/vim-trailing-whitespace
@@ -0,0 +1 @@
+Subproject commit 4c596548216b7c19971f8fc94e38ef1a2b55fee6
diff --git a/.vimrc b/.vimrc
index fee465b..63837fd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -98,31 +98,6 @@ if has("autocmd")
     \ endif
 endif
 
-" Download and install vim-plug
-if empty(glob('~/.vim/autoload/plug.vim'))
-  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-" Plug-ins
-call plug#begin('~/.vim/plugged')
-Plug 'vim-scripts/Indent-Guides'
-Plug 'ambv/black'
-Plug 'bronson/vim-trailing-whitespace'
-Plug 'chriskempson/base16-vim'
-Plug 'ekalinin/Dockerfile.vim'
-Plug 'hynek/vim-python-pep8-indent'
-Plug 'python-mode/python-mode'
-Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-markdown'
-Plug 'tmux-plugins/vim-tmux'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-Plug 'w0rp/ale'
-call plug#end()
-
 " In this house we obey the laws of airline
 let g:airline_powerline_fonts = 1
 let g:airline_enable_fugitive = 1
diff --git a/bin/bootstrap.sh b/bin/bootstrap.sh
deleted file mode 100755
index 71eedaa..0000000
--- a/bin/bootstrap.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-SCRIPTDIR="${HOME}/code/scriptamanent"
-
-# bash
-ln -s "${SCRIPTDIR}/.bashrc" "${HOME}"
-
-# tmux
-ln -s "${SCRIPTDIR}/.tmux.conf" "${HOME}"
-mkdir -p ~/tmux/plugins
-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-
-# vim
-ln -s "${SCRIPTDIR}/.vimrc" "${HOME}"
diff --git a/bin/scriptamanent b/bin/scriptamanent
new file mode 100755
index 0000000..a42eb86
--- /dev/null
+++ b/bin/scriptamanent
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -u
+
+SCRIPTDIR=`dirname \`realpath "${0}"\``
+REPODIR=`realpath ${SCRIPTDIR}/..`
+
+git=`command -v git`
+
+# scripts
+mkdir -p "${HOME}/bin"
+for script in `ls "${SCRIPTDIR}"` ; do
+  ln -s "${SCRIPTDIR}/${script}" "${HOME}/bin/`basename \"${script}\"`"
+done
+
+# bash
+ln -s "${REPODIR}/.bashrc" "${HOME}"
+
+# tmux
+ln -s "${REPODIR}/.tmux.conf" "${HOME}"
+mkdir -p "${HOME}/tmux/plugins"
+"${git}" clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
+# vim
+ln -s "${REPODIR}/.vim/" "${HOME}"
+ln -s "${REPODIR}/.vimrc" "${HOME}"
+"${HOME}/bin/update-vim-plugins"
diff --git a/bin/update-vim-plugins b/bin/update-vim-plugins
new file mode 100755
index 0000000..ab21866
--- /dev/null
+++ b/bin/update-vim-plugins
@@ -0,0 +1,5 @@
+#!/bin/sh
+BINDIR=`dirname \`realpath "${0}"\``
+REPODIR=`realpath ${BINDIR}/..`
+cd "${REPODIR}"
+git submodule update --remote --merge