From: Jannik Zander <59698@grundfos.com>
Date: Mon, 6 Aug 2018 09:06:02 +0000 (+0200)
Subject: Move shougo to opt
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=569ce4a3525b63e4019cc920fb829f5c7b00d957;p=vimfiles.git

Move shougo to opt
---

diff --git a/.gitmodules b/.gitmodules
index b86b8f1..709292e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,11 +77,11 @@
 	path = pack/async/opt/mesonic
 	url = https://github.com/igankevich/mesonic.git
 [submodule "pack/shougo/nvim-yarp"]
-	path = pack/shougo/start/nvim-yarp
+	path = pack/shougo/opt/nvim-yarp
 	url = https://github.com/roxma/nvim-yarp.git
 [submodule "pack/shougo/start/deoplete.nvim"]
-	path = pack/shougo/start/deoplete.nvim
+	path = pack/shougo/opt/deoplete.nvim
 	url = https://github.com/Shougo/deoplete.nvim.git
 [submodule "pack/shougo/start/vim-hug-neovim-rpc"]
-	path = pack/shougo/start/vim-hug-neovim-rpc
+	path = pack/shougo/opt/vim-hug-neovim-rpc
 	url = https://github.com/roxma/vim-hug-neovim-rpc.git
diff --git a/pack/shougo/opt/deoplete.nvim b/pack/shougo/opt/deoplete.nvim
new file mode 160000
index 0000000..57ae326
--- /dev/null
+++ b/pack/shougo/opt/deoplete.nvim
@@ -0,0 +1 @@
+Subproject commit 57ae32605a786fbb2c88bd5c7427dec41df0e209
diff --git a/pack/shougo/opt/nvim-yarp b/pack/shougo/opt/nvim-yarp
new file mode 160000
index 0000000..52317ce
--- /dev/null
+++ b/pack/shougo/opt/nvim-yarp
@@ -0,0 +1 @@
+Subproject commit 52317ced0e16f226f0d44878917d0b5f4657b4d4
diff --git a/pack/shougo/opt/vim-hug-neovim-rpc b/pack/shougo/opt/vim-hug-neovim-rpc
new file mode 160000
index 0000000..4ee5d81
--- /dev/null
+++ b/pack/shougo/opt/vim-hug-neovim-rpc
@@ -0,0 +1 @@
+Subproject commit 4ee5d8119458d82e5e7840cff377d38002c5d844
diff --git a/pack/shougo/start/deoplete.nvim b/pack/shougo/start/deoplete.nvim
deleted file mode 160000
index 57ae326..0000000
--- a/pack/shougo/start/deoplete.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57ae32605a786fbb2c88bd5c7427dec41df0e209
diff --git a/pack/shougo/start/nvim-yarp b/pack/shougo/start/nvim-yarp
deleted file mode 160000
index 52317ce..0000000
--- a/pack/shougo/start/nvim-yarp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52317ced0e16f226f0d44878917d0b5f4657b4d4
diff --git a/pack/shougo/start/vim-hug-neovim-rpc b/pack/shougo/start/vim-hug-neovim-rpc
deleted file mode 160000
index 4ee5d81..0000000
--- a/pack/shougo/start/vim-hug-neovim-rpc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4ee5d8119458d82e5e7840cff377d38002c5d844
diff --git a/vimrc b/vimrc
index 859b7f4..14d0f85 100644
--- a/vimrc
+++ b/vimrc
@@ -82,11 +82,12 @@ set noswapfile
 set viminfo=
 set history=1000
 set tags=.git/tags
-set sessionoptions-=options
+set sessionoptions-=optionsj
 let g:session_directory = "~/.vim/session"
 let g:session_autoload = "no"
 let g:session_autosave = "no"
 let g:session_command_aliases = 1
+let g:netrw_dirhistmax = 0
 
 " system
 set path=.,,**
@@ -97,7 +98,6 @@ if has("win32")
   set shellcmdflag=/c
 endif
 scriptencoding utf-8
-set encoding=utf-8
 set fileencoding=utf-8
 set fileencodings=utf-8,latin1,unicode
 set fileformat=unix
@@ -319,6 +319,9 @@ let g:pick_height = 10
 packadd vim-javascript
 
 " deoplete
+set pyx=3
+set pyxversion=3
+set encoding=utf-8
 let g:deoplete#enable_at_startup = 1
 
 packloadall