From be0a6c50d228ad5040fc3fc027dc7c61b987a65f Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Wed, 28 Oct 2015 10:50:01 -0700
Subject: [PATCH] Fix bootstrapping of neovim

---
 vim-sync-append.sh    | 14 ++++----------
 vimrc => vim/init.vim |  0
 2 files changed, 4 insertions(+), 10 deletions(-)
 rename vimrc => vim/init.vim (100%)

diff --git a/vim-sync-append.sh b/vim-sync-append.sh
index 1af584c..aa7f656 100755
--- a/vim-sync-append.sh
+++ b/vim-sync-append.sh
@@ -4,16 +4,11 @@
 ############################
 #! /bin/bash
 
-if [ -d ~/.vim  ] || [ -f ~/.vimrc ] || [ -d ~/.nvim  ] || [ -f ~/.nvimrc ]; then
-    echo "Vim files already exist. Please backup or remove .(n)vim and .(n)vimrc"
+if [ -d ~/.vim  ] || [ -f ~/.vimrc ] || [ -d ~/.nvim  ] || [ -f ~/.nvimrc ] || [ -d ~/.config/nvim  ]; then
+    echo "Vim files already exist. Please backup or remove .(n)vim and .(n)vimrc and .config/nvim"
     exit 1
 fi
 
-# Try to load .bashrc to load rvm functions
-# if [ -f ~/.bashrc ]; then
-    # . ~/.bashrc
-# fi
-
 # Get current directory for future use in links
 VIM_SYNC_DIR=$(dirname $0)
 cd $VIM_SYNC_DIR
@@ -21,16 +16,15 @@ VIM_SYNC_DIR=$(pwd)
 
 
 # Vim
-ln -s $VIM_SYNC_DIR/vimrc ~/.vimrc
+ln -s $VIM_SYNC_DIR/vim/init.vim ~/.vimrc
 ln -s $VIM_SYNC_DIR/vim ~/.vim
 
 # Neovim legacy
-ln -s $VIM_SYNC_DIR/vimrc ~/.nvimrc
+ln -s $VIM_SYNC_DIR/vim/init.vim ~/.nvimrc
 ln -s $VIM_SYNC_DIR/vim ~/.nvim
 
 # Neovim new
 mkdir -p ${XDG_CONFIG_HOME:=$HOME/.config}
-ln -s $VIM_SYNC_DIR/vimrc $XDG_CONFIG_HOME/nvim/init.vim
 ln -s $VIM_SYNC_DIR/vim $XDG_CONFIG_HOME/nvim
 
 # Install all bundles
diff --git a/vimrc b/vim/init.vim
similarity index 100%
rename from vimrc
rename to vim/init.vim