Merge branch 'master' into docker_fedora

This commit is contained in:
Cyryl Płotnicki 2016-12-29 20:50:53 +00:00 committed by GitHub
commit c457691e52
4 changed files with 31 additions and 1 deletions

View file

@ -0,0 +1,11 @@
{
"window.zoomLevel": 1,
"extensions.autoUpdate": true,
"editor.cursorStyle": "block",
"rust.rustLangSrcPath": "/home/cyryl/dev/rust/src",
"rust.racerPath": "/home/cyryl/.cargo/bin/racer",
"rust.rustfmtPath": "/home/cyryl/.cargo/bin/rustfmt",
"rust.rustsymPath": "/home/cyryl/.cargo/bin/rustsym",
"rust.cargoPath": "/home/cyryl/.cargo/bin/cargo",
"rust.cargoHome": "/home/cyryl/.cargo/"
}

View file

@ -55,6 +55,8 @@ ln -vfs "$DIR/.config/autostart/redshift-gtk.desktop" ~/.config/autostart/
mkdir -p ~/.config/vdirsyncer/
ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/
ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf
mkdir -p ~/.config/Code/User
ln -vfs "$DIR/.config/Code/User/settings.json" ~/.config/Code/User/settings.json
source ~/.setenv

View file

@ -38,6 +38,23 @@ fi
sudo groupadd docker
sudo usermod -aG docker $USER
# vscode
mkdir -p ~/Downloads
cd ~/Downloads
rm -fv *code*.rpm
aria2c "https://go.microsoft.com/fwlink/?LinkID=760867"
sudo dnf -y install code*.rpm
if [ "$(id -u)" != "0" ]; then
code --install-extension cssho.vscode-svgviewer
code --install-extension donjayamanne.python
code --install-extension saviorisdead.RustyCode
code --install-extension seanmcbreen.Spell
code --install-extension searKing.preview-vscode
code --install-extension vscodevim.vim
fi
# vim
if [[ -z $NO_COMPILE_VIM ]]; then
VIM_BUILD_DIR=/tmp
cd "$VIM_BUILD_DIR"

View file

@ -1,5 +1,5 @@
@echo on
choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag golang
choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag golang windows-adk-all
call refreshenv
wget -c https://cygwin.com/setup-x86_64.exe