From 75812ddcb6bd16e7b89a131961c3eb5058fd02e2 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 10 Dec 2015 23:14:44 +0100 Subject: [PATCH] use zprofile instead of zshenv /etc/profile will overwrite PATH when using zshenv, see https://bugs.archlinux.org/task/35966 --- zprofile | 22 ++++++++++++++++++++++ zshrc | 25 ------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) create mode 100644 zprofile diff --git a/zprofile b/zprofile new file mode 100644 index 0000000..b7094a7 --- /dev/null +++ b/zprofile @@ -0,0 +1,22 @@ +# extend path +export PATH="$HOME/local/bin:$PATH" + +# nvm +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" + +# Base16 Shell +BASE16_SCHEME="solarized" +BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh" +[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL + +######################## +# Dist related settings +######################## +case $OSTYPE in + "darwin14.0" ) + export PATH="$(brew --prefix coreutils)/libexec/gnubin:/usr/local/bin:$PATH" + export MANPATH="$(brew --prefix coreutils)/libexec/gnuman:$MANPATH" + #eval $(ssh-agent -s) + ;; +esac diff --git a/zshrc b/zshrc index 03db121..9718714 100644 --- a/zshrc +++ b/zshrc @@ -23,31 +23,6 @@ if ! zgen saved; then zgen save fi -# extend path -export PATH="$HOME/local/bin:$PATH" - -# nvm -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" -# use node version specified in ~/.nvmrc as default -nvm use > /dev/null - -# Base16 Shell -BASE16_SCHEME="solarized" -BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh" -[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL - -######################## -# Dist related settings -######################## -case $OSTYPE in - "darwin14.0" ) - export PATH="$(brew --prefix coreutils)/libexec/gnubin:/usr/local/bin:$PATH" - export MANPATH="$(brew --prefix coreutils)/libexec/gnuman:$MANPATH" - #eval $(ssh-agent -s) - ;; -esac - ######################## # Other settings ########################