Fix issues with nvim config linking

nvim/vim configs no longer refer explicitly to the `.vim` folder, and we
permanently symlink `init.vim`, so the install scripts no longer have
to.

.gitignore

@@ -2,7 +2,6 @@
 vim/.netrwhist
 vim/autoload/plug.vim.old
 vim/current-colour
-vim/init.vim
 vim/plugged
 vim/spell
 vim/use-solarized-palette

Makefile

@@ -73,12 +73,10 @@ vim:
 	./bin/linkup ~/dotfiles/vim ~/.vim
 	./bin/linkup ~/dotfiles/vim/vimrc ~/.vimrc
 	./bin/linkup ~/dotfiles/vim $(XDG_CONFIG_HOME)/nvim
-	./bin/linkup ~/dotfiles/vim/vimrc $(XDG_CONFIG_HOME)/nvim/init.vim
 	@vim -u ~/dotfiles/vim/plugins.vim -N +PlugClean! +PlugUpdate! +quitall!
 rm-vim:
 	rm ~/.vim
 	rm ~/.vimrc
-	rm $(XDG_CONFIG_HOME)/nvim/init.vim
 	rm $(XDG_CONFIG_HOME)/nvim
 
 # }}}

install

@@ -43,7 +43,6 @@ echo "Vimperator linked."
 ~/dotfiles/bin/linkup ~/dotfiles/vim ~/.vim
 ~/dotfiles/bin/linkup ~/dotfiles/vim/vimrc ~/.vimrc
 ~/dotfiles/bin/linkup ~/dotfiles/vim $XDG_CONFIG_HOME/nvim
-~/dotfiles/bin/linkup ~/dotfiles/vim/vimrc $XDG_CONFIG_HOME/nvim/init.vim
 echo "Vim linked."
 
 # vim-plug install process. Starts with plugin list and `nocompatible` flag.

vim/init.vim

@@ -0,0 +1 @@
+vimrc

vim/plugins.vim

@@ -8,7 +8,7 @@
 " - setup.sh
 "
 
-call plug#begin('~/.vim/plugged')
+call plug#begin('~/dotfiles/vim/plugged')
 
 " General {{{
 Plug 'Raimondi/delimitMate'