From 0b3c32ff23dead9d58d8ed8c326db47f8540a1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Sat, 4 Jun 2016 09:12:19 +0200
Subject: [PATCH] env var setting extracted out to allow use in the common
 configuration script

---
 .setenv                       | 13 +++++++++++++
 .zshrc                        | 16 +---------------
 common/configure_fresh_system |  8 ++++----
 3 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 .setenv

diff --git a/.setenv b/.setenv
new file mode 100644
index 00000000..c5b25623
--- /dev/null
+++ b/.setenv
@@ -0,0 +1,13 @@
+
+export GOPATH=~/go
+PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+export PATH=$HOME/tools:$PATH
+export PATH=$GOPATH/bin:$PATH
+export PATH=$HOME/.local/bin:$PATH
+export PATH=/usr/local/heroku/bin:$PATH
+export PATH=$HOME/tools/subuser/logic:$HOME/.subuser/bin:$PATH
+export PATH=$HOME/.multirust/toolchains/stable/cargo/bin:$PATH
+export PATH=$HOME/.cargo/bin:$PATH
+export RUST_SRC_PATH=$HOME/dev/rust/src
+export EDITOR="vim"
+export KEYTIMEOUT=1
diff --git a/.zshrc b/.zshrc
index 610ab2df..924388c3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -46,20 +46,6 @@ else
 fi
 
 # env vars
-export GOPATH=~/go
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
-export PATH=$HOME/tools:$PATH
-export PATH=$GOPATH/bin:$PATH
-export PATH=$HOME/.local/bin:$PATH
-export PATH=/usr/local/heroku/bin:$PATH
-export PATH=$HOME/tools/subuser/logic:$HOME/.subuser/bin:$PATH
-export PATH=$HOME/.multirust/toolchains/stable/cargo/bin:$PATH
-export PATH=$HOME/.cargo/bin:$PATH
-export RUST_SRC_PATH=$HOME/dev/rust/src
-export EDITOR="vim"
-export KEYTIMEOUT=1
-#
-#temporary fix for rustc [https://github.com/rust-lang/rust-installer/issues/30], for Fedora only
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+source ~/.setenv
 
 
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index ab412142..d9f9ae3a 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -25,6 +25,7 @@ ln -vfs "$DIR/.vimrc" ~/.
 ln -vfs "$DIR/.tmux.conf" ~/.
 rm -f "~/.zshrc"
 ln -vfs "$DIR/.zshrc" ~/.
+ln -vfs "$DIR/.setenv" ~/.
 ln -vfs "$DIR/.oh-my-zsh" ~/.
 ln -vfs "$DIR/.oh-my-zsh-plugins/zsh-syntax-highlighting" ~/.oh-my-zsh/custom/plugins/
 ln -vfs "$DIR/.Slic3r" ~/.
@@ -40,6 +41,8 @@ mkdir -p ~/.config/vdirsyncer/
 ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/
 ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf
 
+source ~/.setenv
+
 cd "$DIR/.vim/bundle/YouCompleteMe/"
 git submodule update --init --recursive
 python install.py --clang-completer
@@ -86,11 +89,8 @@ else
 fi
 
 cargo install rustfmt
-
-# racer
-set +e
+cargo install clippy
 cargo install racer
-set -e
 
 # rvm
 gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3