From 41312b5427c32ab5e8d145c02164020c13d44ae4 Mon Sep 17 00:00:00 2001
From: Max Christian Pohle
Date: Mon, 29 Oct 2018 18:20:12 +0100
Subject: Fixed submodule handling

---
 .gitignore             |  6 ++++++
 .gitmodules            | 49 +++++++++++++++++++++++--------------------------
 pack/neovim/opt/.empty |  1 +
 pack/vim/opt/.empty    |  1 +
 4 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pack/neovim/opt/.empty
 create mode 100644 pack/vim/opt/.empty

diff --git a/.gitignore b/.gitignore
index 93df1ba..376cb65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,9 @@
 /spell/**
 !spell/.keep
 /systags
+pack/_all/start/**
+pack/_all/opt/**
+pack/neovim/start/**
+pack/neovim/opt/**
+pack/vim/start/**
+pack/vim/opt/**
diff --git a/.gitmodules b/.gitmodules
index a24b441..c05f40d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,57 @@
-[submodule "autoload"]
-	path = autoload
-	url = https://github.com/junegunn/vim-plug
-[submodule "plugin/YouCompleteMe"]
+[submodule "pack/vim/opt/YouCompleteMe"]
 	path = pack/vim/opt/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
-[submodule "plugin/vim-remote-menu"]
+[submodule "pack/_all/start/vim-remote-menu"]
 	path = pack/_all/start/vim-remote-menu
 	url = https://github.com/coderonline/vim-remote-menu.git
-[submodule "plugin/base16-vim"]
+[submodule "pack/_all/start/base16-vim"]
 	path = pack/_all/start/base16-vim
 	url = https://github.com/chriskempson/base16-vim.git
-[submodule "plugin/papercolor-theme"]
+[submodule "pack/_all/start/papercolor-theme"]
 	path = pack/_all/start/papercolor-theme
 	url = https://github.com/NLKNguyen/papercolor-theme.git
-[submodule "plugin/vim-signify"]
+[submodule "pack/_all/opt/vim-signify"]
 	path = pack/_all/opt/vim-signify
 	url = https://github.com/mhinz/vim-signify.git
-[submodule "plugin/vim-fugitive"]
+[submodule "pack/_all/start/vim-fugitive"]
 	path = pack/_all/start/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive.git
-[submodule "plugin/tabular"]
+[submodule "pack/_all/start/tabular"]
 	path = pack/_all/start/tabular
 	url = https://github.com/godlygeek/tabular.git
-[submodule "plugin/tagbar"]
+[submodule "pack/_all/opt/tagbar"]
 	path = pack/_all/opt/tagbar
 	url = https://github.com/majutsushi/tagbar.git
-[submodule "plugin/vim-surround"]
+[submodule "pack/_all/start/vim-surround"]
 	path = pack/_all/start/vim-surround
 	url = https://github.com/tpope/vim-surround.git
-[submodule "plugin/nerdtree"]
+[submodule "pack/_all/opt/nerdtree"]
 	path = pack/_all/opt/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
-[submodule "plugin/ultisnips"]
+[submodule "pack/_all/opt/ultisnips"]
 	path = pack/_all/opt/ultisnips
 	url = https://github.com/SirVer/ultisnips.git
-[submodule "plugin/vim-snippets"]
+[submodule "pack/_all/opt/vim-snippets"]
 	path = pack/_all/opt/vim-snippets
 	url = https://github.com/honza/vim-snippets.git
-[submodule "plugin-neovim/deoplete.nvim"]
-	path = pack/neovim/start/deoplete.nvim
+[submodule "pack/neovim/opt/deoplete.nvim"]
+	path = pack/neovim/opt/deoplete.nvim
 	url = https://github.com/Shougo/deoplete.nvim.git
-[submodule "plugin-neovim/echodoc.vim"]
-	path = pack/neovim/start/echodoc.vim
+[submodule "pack/neovim/opt/echodoc.vim"]
+	path = pack/neovim/opt/echodoc.vim
 	url = https://github.com/Shougo/echodoc.vim.git
-[submodule "plugin-neovim/LanguageClient-neovim"]
-	path = pack/neovim/start/LanguageClient-neovim
+[submodule "pack/neovim/opt/LanguageClient-neovim"]
+	path = pack/neovim/opt/LanguageClient-neovim
 	url = https://github.com/autozimu/LanguageClient-neovim.git
-[submodule "plugin-neovim/ale"]
-	path = pack/neovim/start/ale
+[submodule "pack/neovim/opt/ale"]
+	path = pack/neovim/opt/ale
 	url = https://github.com/w0rp/ale.git
-[submodule "plugin-vim/syntastic"]
+[submodule "pack/vim/opt/syntastic"]
 	path = pack/vim/opt/syntastic
 	url = https://github.com/vim-syntastic/syntastic.git
-[submodule "plugin/jedi-vim"]
+[submodule "pack/_all/opt/jedi-vim"]
 	path = pack/_all/opt/jedi-vim
 	url = https://github.com/davidhalter/jedi-vim.git
-[submodule "plugin/vim-operator-user"]
+[submodule "pack/_all/start/vim-operator-user"]
 	path = pack/_all/start/vim-operator-user
 	url = https://github.com/kana/vim-operator-user.git
diff --git a/pack/neovim/opt/.empty b/pack/neovim/opt/.empty
new file mode 100644
index 0000000..c381d32
--- /dev/null
+++ b/pack/neovim/opt/.empty
@@ -0,0 +1 @@
+We need this folder to deploy our git submodules.
diff --git a/pack/vim/opt/.empty b/pack/vim/opt/.empty
new file mode 100644
index 0000000..c381d32
--- /dev/null
+++ b/pack/vim/opt/.empty
@@ -0,0 +1 @@
+We need this folder to deploy our git submodules.
-- 
cgit v1.2.3