Makefile: install neovim config.

Makefile

@@ -1,7 +1,7 @@
 FILES = bashrc bash_profile vimrc zshrc gitconfig screenrc commonshrc liquidpromptrc \
 	gnomerc gvimrc muttrc pentadactylrc mailcap latexmkrc ctags \
 	i3/config i3status.conf msmtprc spacemacs emacs.d mbsyncrc authinfo \
-	config/qutebrowser
+	config/qutebrowser config/nvim/init.vim
 
 .PHONY: install clean check
 
@@ -32,12 +32,13 @@ install-conf: $(FILES) $(foreach i,$(FILES),install-file/$(i))
 install-file/%: %
 	mkdir -p ~/.$(dir $<) && ln -Trsf $< ~/.$<
 
-VIM_DIR = $(HOME)/.vim
+VIM_DIR = $(HOME)/.config/nvim
 
 install-vim-plug:
 	mkdir -p $(VIM_DIR)/autoload
 	test -f $(VIM_DIR)/autoload/plug.vim || curl -fLo $(VIM_DIR)/autoload/plug.vim \
 	  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+	cp $(VIM_DIR)/autoload/plug.vim $(HOME)/.vim
 
 mbsyncrc: mbsyncrc.m4
 	umask 077; m4 $< >$@

config/nvim/init.vim

@@ -0,0 +1 @@
+../../vimrc

vimrc

@@ -125,9 +125,6 @@ au syntax haskell setl omnifunc=necoghc#omnifunc
 let g:necoghc_enable_detailed_browse=1
 let g:haskell_conceal              = 0
 
-" source ~/etc/base16.vim
-" colors base16-default
-
 au syntax tex setl iskeyword+=:
 let g:syntastic_tex_checkers=['lacheck']
 let g:syntastic_scala_checkers=[]