Merge branch 'master' into vscode_update

This commit is contained in:
Cyryl Płotnicki 2016-09-24 15:52:55 +02:00 committed by GitHub
commit 0a98162106
3 changed files with 9 additions and 6 deletions

View file

@ -1,6 +1,6 @@
source .vimrc.cygwin.prelude source ~/dev/dotfiles/.vimrc.common.prelude
source .vimrc.common.plugins source ~/dev/dotfiles/.vimrc.common.plugins
source .vimrc.cygwin.plugins source ~/dev/dotfiles/.vimrc.cygwin.plugins
source .vimrc.common.epilogue source ~/dev/dotfiles/.vimrc.common.epilogue
source .vimrc.cygwin.settings source ~/dev/dotfiles/.vimrc.cygwin.settings

View file

@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus
call refreshenv call refreshenv
wget -c https://cygwin.com/setup-x86_64.exe wget -c https://cygwin.com/setup-x86_64.exe
setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl,the_silver_searcher setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl,the_silver_searcher
set script_path=%~dp0 set script_path=%~dp0
set repo_path=%script_path%\..\ set repo_path=%script_path%\..\

View file

@ -25,3 +25,6 @@ ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/
ln -vfs $DIR/.gitconfig.cygwin $HOME/.gitconfig ln -vfs $DIR/.gitconfig.cygwin $HOME/.gitconfig
ln -vfs $DIR/.vimrc.cygwin $HOME/.vimrc ln -vfs $DIR/.vimrc.cygwin $HOME/.vimrc
# reinstall plugins with the new vimrc
echo "\n" | vim +PluginInstall +qa