Explorar el Código

Revert vim plugin install simplification

There was a reason those extra options (nocompat, only load plugins.vim)
where there: for fresh dotfiles installs which don't have plugins
downloaded yet, some things, like the setting of the solarized
colourscheme throw errors.
Weiyi Lou hace 10 años
padre
commit
5998c8f799
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. 2 1
      Makefile
  2. 2 1
      install

+ 2 - 1
Makefile

@@ -79,7 +79,8 @@ vim:
 	@./bin/linkup ~/dotfiles/vim ~/.vim
 	@./bin/linkup ~/dotfiles/vim/vimrc ~/.vimrc
 	@./bin/linkup ~/dotfiles/vim $(XDG_CONFIG_HOME)/nvim
-	@vim +PlugClean! +PlugUpdate! +quitall!
+	@# Use barebones config to avoid vimrc errors on fresh dotfiles installs.
+	@vim -N -u ~/dotfiles/vim/plugins.vim +PlugClean! +PlugUpdate! +quitall!
 rm-vim:
 	rm ~/.vim
 	rm ~/.vimrc

+ 2 - 1
install

@@ -41,6 +41,7 @@ echo "Git config done."
 ~/dotfiles/bin/linkup ~/dotfiles/vim ~/.vim
 ~/dotfiles/bin/linkup ~/dotfiles/vim/vimrc ~/.vimrc
 ~/dotfiles/bin/linkup ~/dotfiles/vim $XDG_CONFIG_HOME/nvim
-vim +PlugClean! +PlugUpdate! +quitall!
+# Use barebones config to avoid vimrc errors on fresh dotfiles installs.
+vim -N -u ~/dotfiles/vim/plugins.vim +PlugClean! +PlugUpdate! +quitall!
 
 echo "Install complete!"