Switch to nvim layout

.gitmodules

@@ -1,120 +1,120 @@
 [submodule ".vim/bundle/vim-argwrap"]
-	path = .vim/pack/plugins/start/vim-argwrap
+	path = pack/plugins/start/vim-argwrap
 	url = https://github.com/FooSoft/vim-argwrap.git
 [submodule ".vim/bundle/vim-toml"]
-	path = .vim/pack/plugins/start/vim-toml
+	path = pack/plugins/start/vim-toml
 	url = https://github.com/cespare/vim-toml.git
 [submodule ".vim/bundle/vim-sort-motion"]
-	path = .vim/pack/plugins/start/vim-sort-motion
+	path = pack/plugins/start/vim-sort-motion
 	url = https://github.com/christoomey/vim-sort-motion.git
 [submodule ".vim/bundle/vim-fswitch"]
-	path = .vim/pack/plugins/start/vim-fswitch
+	path = pack/plugins/start/vim-fswitch
 	url = https://github.com/derekwyatt/vim-fswitch.git
 [submodule ".vim/bundle/vim-go"]
-	path = .vim/pack/plugins/start/vim-go
+	path = pack/plugins/start/vim-go
 	url = https://github.com/fatih/vim-go.git
 [submodule ".vim/bundle/vim-easy-align"]
-	path = .vim/pack/plugins/start/vim-easy-align
+	path = pack/plugins/start/vim-easy-align
 	url = https://github.com/junegunn/vim-easy-align.git
 [submodule ".vim/bundle/vim-indent-object"]
-	path = .vim/pack/plugins/start/vim-indent-object
+	path = pack/plugins/start/vim-indent-object
 	url = https://github.com/michaeljsmith/vim-indent-object.git
 [submodule ".vim/bundle/vim-bbye"]
-	path = .vim/pack/plugins/start/vim-bbye
+	path = pack/plugins/start/vim-bbye
 	url = https://github.com/moll/vim-bbye.git
 [submodule ".vim/bundle/vim-better-whitespace"]
-	path = .vim/pack/plugins/start/vim-better-whitespace
+	path = pack/plugins/start/vim-better-whitespace
 	url = https://github.com/ntpeters/vim-better-whitespace.git
 [submodule ".vim/bundle/html5.vim"]
-	path = .vim/pack/plugins/start/html5.vim
+	path = pack/plugins/start/html5.vim
 	url = https://github.com/othree/html5.vim.git
 [submodule ".vim/bundle/vim-javascript"]
-	path = .vim/pack/plugins/start/vim-javascript
+	path = pack/plugins/start/vim-javascript
 	url = https://github.com/pangloss/vim-javascript.git
 [submodule ".vim/bundle/vim-markdown"]
-	path = .vim/pack/plugins/start/vim-markdown
+	path = pack/plugins/start/vim-markdown
 	url = https://github.com/plasticboy/vim-markdown.git
 [submodule ".vim/bundle/vim-bufonly"]
-	path = .vim/pack/plugins/start/vim-bufonly
+	path = pack/plugins/start/vim-bufonly
 	url = https://github.com/schickling/vim-bufonly.git
 [submodule ".vim/bundle/vim-abolish"]
-	path = .vim/pack/plugins/start/vim-abolish
+	path = pack/plugins/start/vim-abolish
 	url = https://github.com/tpope/vim-abolish.git
 [submodule ".vim/bundle/vim-eunuch"]
-	path = .vim/pack/plugins/start/vim-eunuch
+	path = pack/plugins/start/vim-eunuch
 	url = https://github.com/tpope/vim-eunuch.git
 [submodule ".vim/bundle/vim-repeat"]
-	path = .vim/pack/plugins/start/vim-repeat
+	path = pack/plugins/start/vim-repeat
 	url = https://github.com/tpope/vim-repeat
 [submodule ".vim/bundle/vim-speeddating"]
-	path = .vim/pack/plugins/start/vim-speeddating
+	path = pack/plugins/start/vim-speeddating
 	url = https://github.com/tpope/vim-speeddating.git
 [submodule ".vim/bundle/vim-surround"]
-	path = .vim/pack/plugins/start/vim-surround
+	path = pack/plugins/start/vim-surround
 	url = https://github.com/tpope/vim-surround
 [submodule ".vim/bundle/vim-unimpaired"]
-	path = .vim/pack/plugins/start/vim-unimpaired
+	path = pack/plugins/start/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired.git
 [submodule ".vim/bundle/vim-interestingwords"]
-	path = .vim/pack/plugins/start/vim-interestingwords
+	path = pack/plugins/start/vim-interestingwords
 	url = https://github.com/vasconcelloslf/vim-interestingwords.git
 [submodule ".vim/bundle/vim-airline-themes"]
-	path = .vim/pack/plugins/start/vim-airline-themes
+	path = pack/plugins/start/vim-airline-themes
 	url = https://github.com/vim-airline/vim-airline-themes.git
 [submodule ".vim/bundle/vim-airline"]
-	path = .vim/pack/plugins/start/vim-airline
+	path = pack/plugins/start/vim-airline
 	url = https://github.com/vim-airline/vim-airline.git
 [submodule ".vim/bundle/vim-indent-guides"]
-	path = .vim/pack/plugins/start/vim-indent-guides
+	path = pack/plugins/start/vim-indent-guides
 	url = https://github.com/nathanaelkane/vim-indent-guides.git
 [submodule ".vim/bundle/vim-jdaddy"]
-	path = .vim/pack/plugins/start/vim-jdaddy
+	path = pack/plugins/start/vim-jdaddy
 	url = https://github.com/tpope/vim-jdaddy.git
 [submodule ".vim/bundle/vim-rooter"]
-	path = .vim/pack/plugins/start/vim-rooter
+	path = pack/plugins/start/vim-rooter
 	url = https://github.com/airblade/vim-rooter.git
 [submodule ".vim/bundle/vim-dirvish"]
-	path = .vim/pack/plugins/start/vim-dirvish
+	path = pack/plugins/start/vim-dirvish
 	url = https://github.com/justinmk/vim-dirvish.git
 [submodule ".vim/bundle/vim-signify"]
-	path = .vim/pack/plugins/start/vim-signify
+	path = pack/plugins/start/vim-signify
 	url = https://github.com/mhinz/vim-signify.git
 [submodule ".vim/bundle/fzf"]
-	path = .vim/pack/plugins/start/fzf
+	path = pack/plugins/start/fzf
 	url = https://github.com/junegunn/fzf
 [submodule ".vim/bundle/fzf.vim"]
-	path = .vim/pack/plugins/start/fzf.vim
+	path = pack/plugins/start/fzf.vim
 	url = https://github.com/junegunn/fzf.vim.git
 [submodule ".vim/bundle_extra/deoplete.nvim"]
-	path = .vim/pack/plugins/start/deoplete.nvim
+	path = pack/plugins/start/deoplete.nvim
 	url = https://github.com/Shougo/deoplete.nvim.git
 [submodule ".vim/bundle_extra/nvim-yarp"]
-	path = .vim/pack/plugins/start/nvim-yarp
+	path = pack/plugins/start/nvim-yarp
 	url = https://github.com/roxma/nvim-yarp.git
 [submodule ".vim/bundle_extra/vim-hug-neovim-rpc"]
-	path = .vim/pack/plugins/start/vim-hug-neovim-rpc
+	path = pack/plugins/start/vim-hug-neovim-rpc
 	url = https://github.com/roxma/vim-hug-neovim-rpc
 [submodule ".vim/bundle/tcomment_vim"]
-	path = .vim/pack/plugins/start/tcomment_vim
+	path = pack/plugins/start/tcomment_vim
 	url = https://github.com/tomtom/tcomment_vim
 [submodule ".vim/bundle/vim-header"]
-	path = .vim/pack/plugins/start/vim-header
+	path = pack/plugins/start/vim-header
 	url = https://github.com/alpertuna/vim-header.git
 [submodule ".vim/bundle/vim-angry"]
-	path = .vim/pack/plugins/start/vim-angry
+	path = pack/plugins/start/vim-angry
 	url = https://github.com/b4winckler/vim-angry.git
 [submodule ".vim/bundle/ListToggle"]
-	path = .vim/pack/plugins/start/ListToggle
+	path = pack/plugins/start/ListToggle
 	url = https://github.com/Valloric/ListToggle.git
 [submodule ".vim/bundle/ale"]
-	path = .vim/pack/plugins/start/ale
+	path = pack/plugins/start/ale
 	url = https://github.com/dense-analysis/ale.git
 [submodule ".vim/bundle/rust.vim"]
-	path = .vim/pack/plugins/start/rust.vim
+	path = pack/plugins/start/rust.vim
 	url = https://github.com/rust-lang/rust.vim
 [submodule ".vim/bundle/vim-solarized8"]
-	path = .vim/pack/plugins/start/vim-solarized8
+	path = pack/plugins/start/vim-solarized8
 	url = https://github.com/lifepillar/vim-solarized8.git
 [submodule ".vim/pack/plugins/start/vim-fugitive"]
-	path = .vim/pack/plugins/start/vim-fugitive
+	path = pack/plugins/start/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive.git

.vim/nvim/init.vim

@@ -1,3 +0,0 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath=&runtimepath
-source ~/.vimrc

bin/install.bat

@@ -1,3 +1,2 @@
 @echo off
-
 git submodule update --init --recursive

bin/install.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 git submodule update --init --recursive
-
 if [ -x "$(command -v pip3)" ]; then
     pip3 install --user pynvim
     pip3 install --user python-language-server

bin/link.bat

@@ -1,5 +1,4 @@
 @echo off
-
 mklink "%USERPROFILE%\_vimrc" "%CD%\.vimrc"
 mklink "%USERPROFILE%\_gvimrc" "%CD%\.gvimrc"
 mklink /J "%USERPROFILE%\vimfiles" "%CD%\.vim"

bin/link_nvim.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+pushd $PWD/..
+if [ ! -d ~/.config/nvim ]; then
+    ln -s $PWD ~/.config/nvim
+fi
+popd

bin/link_vim.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+pushd $PWD/..
+ln -sf $PWD/init.vim ~/.vimrc
+ln -sf $PWD/gvim.vim ~/.gvimrc
+if [ ! -d ~/.vim ]; then
+    ln -s $PWD ~/.vim
+fi
+popd

bin/upgrade.bat

@@ -1,4 +1,3 @@
 @echo off
-
 git submodule foreach git pull origin master
 git submodule foreach --recursive git submodule update

bin/upgrade.sh

@@ -1,4 +1,3 @@
 #!/bin/sh
-
 git submodule foreach git pull origin master
 git submodule foreach --recursive git submodule update

link.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-ln -sf $PWD/.vimrc ~/
-ln -sf $PWD/.gvimrc ~/
-ln -sf $PWD/.vim ~/
-ln -sf $PWD/.vim/nvim ~/.config/