From 569ce4a3525b63e4019cc920fb829f5c7b00d957 Mon Sep 17 00:00:00 2001
From: Jannik Zander <59698@grundfos.com>
Date: Mon, 6 Aug 2018 11:06:02 +0200
Subject: [PATCH] Move shougo to opt

---
 .gitmodules                                   | 6 +++---
 pack/shougo/{start => opt}/deoplete.nvim      | 0
 pack/shougo/{start => opt}/nvim-yarp          | 0
 pack/shougo/{start => opt}/vim-hug-neovim-rpc | 0
 vimrc                                         | 7 +++++--
 5 files changed, 8 insertions(+), 5 deletions(-)
 rename pack/shougo/{start => opt}/deoplete.nvim (100%)
 rename pack/shougo/{start => opt}/nvim-yarp (100%)
 rename pack/shougo/{start => opt}/vim-hug-neovim-rpc (100%)

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/start/deoplete.nvim b/pack/shougo/opt/deoplete.nvim
similarity index 100%
rename from pack/shougo/start/deoplete.nvim
rename to pack/shougo/opt/deoplete.nvim
diff --git a/pack/shougo/start/nvim-yarp b/pack/shougo/opt/nvim-yarp
similarity index 100%
rename from pack/shougo/start/nvim-yarp
rename to pack/shougo/opt/nvim-yarp
diff --git a/pack/shougo/start/vim-hug-neovim-rpc b/pack/shougo/opt/vim-hug-neovim-rpc
similarity index 100%
rename from pack/shougo/start/vim-hug-neovim-rpc
rename to pack/shougo/opt/vim-hug-neovim-rpc
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
-- 
2.43.0