Merge branch 'master' into benice

This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-07-09 12:24:30 +02:00 committed by GitHub
commit 7c0d42931c
4 changed files with 5 additions and 10 deletions

3
.gitmodules vendored
View file

@ -53,9 +53,6 @@
[submodule ".vim/bundle/rust.vim"] [submodule ".vim/bundle/rust.vim"]
path = .vim/bundle/rust.vim path = .vim/bundle/rust.vim
url = https://github.com/rust-lang/rust.vim.git url = https://github.com/rust-lang/rust.vim.git
[submodule ".vim/bundle/racer"]
path = .vim/bundle/racer
url = https://github.com/phildawes/racer.git
[submodule ".vim/bundle/YouCompleteMe"] [submodule ".vim/bundle/YouCompleteMe"]
path = .vim/bundle/YouCompleteMe path = .vim/bundle/YouCompleteMe
url = https://github.com/Valloric/YouCompleteMe.git url = https://github.com/Valloric/YouCompleteMe.git

@ -1 +0,0 @@
Subproject commit f877a066cda349f8747a8d2de3ca7bcb4603dcfb

View file

@ -43,10 +43,6 @@ ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf
source ~/.setenv source ~/.setenv
cd "$DIR/.vim/bundle/YouCompleteMe/"
git submodule update --init --recursive
python install.py --clang-completer
# symlink 'nodejs' as node on some systems # symlink 'nodejs' as node on some systems
# will replace symlink if it exists, but won't replace regular file # will replace symlink if it exists, but won't replace regular file
if [[ ! -f /usr/bin/node ]]; then if [[ ! -f /usr/bin/node ]]; then
@ -90,7 +86,10 @@ else
fi fi
cargo install -f rustfmt cargo install -f rustfmt
cargo install -f racer
cd "$DIR/.vim/bundle/YouCompleteMe/"
git submodule update --init --recursive
./install.py --racer-completer --clang-completer
# go # go
export GOPATH="$HOME/go" export GOPATH="$HOME/go"

View file

@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb
FEDORA_VERSION=`rpm -E %fedora` FEDORA_VERSION=`rpm -E %fedora`
sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs
sudo dnf -y groupinstall "C Development Tools and Libraries" sudo dnf -y groupinstall "C Development Tools and Libraries"
if [[ -z $DONT_START_TOR ]]; then if [[ -z $DONT_START_TOR ]]; then