From ac429f7a9bd9d0a87e2ee6d73b8936a706d841b2 Mon Sep 17 00:00:00 2001 From: mj Date: Wed, 1 Apr 2015 06:09:35 +0200 Subject: [PATCH] .zshrc.sh / mj.zsh-theme: virtualenv / virtualenvwrapper --- custom/themes/mj.zsh-theme | 2 +- dotfiles/zshrc.sh | 7 +++++++ templates/zshrc.sh | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/custom/themes/mj.zsh-theme b/custom/themes/mj.zsh-theme index a024ac0..4576448 100644 --- a/custom/themes/mj.zsh-theme +++ b/custom/themes/mj.zsh-theme @@ -15,7 +15,7 @@ GIT_DIRTY_COLOR=$FG[133] GIT_CLEAN_COLOR=$FG[118] GIT_PROMPT_INFO=$FG[012] -PROMPT='%{$MNCOLOR%}%m%{${reset_color}%} %{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ%{$reset_color%} ' +PROMPT='%{$MNCOLOR%}%m%{${reset_color}%}$(virtualenv_prompt_info) %{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ%{$reset_color%} ' #RPS1="${return_code}" diff --git a/dotfiles/zshrc.sh b/dotfiles/zshrc.sh index 9bbd7ba..59679c7 100644 --- a/dotfiles/zshrc.sh +++ b/dotfiles/zshrc.sh @@ -24,6 +24,13 @@ ZSH_CUSTOM=$ZCFG/custom plugins+=(command-not-found common-aliases debian dirhistory git history history-substring-search systemadmin zsh_reload) +# virtualenvwrapper +if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then + export WORKON_HOME=$HOME/.virtualenvs + source /usr/local/bin/virtualenvwrapper.sh + plugins+=(pip python virtualenv virtualenvwrapper) +fi + # User configuration export PATH=$HOME/bin:/usr/local/bin:$PATH # export MANPATH="/usr/local/man:$MANPATH" diff --git a/templates/zshrc.sh b/templates/zshrc.sh index b9b3b29..470819d 100644 --- a/templates/zshrc.sh +++ b/templates/zshrc.sh @@ -15,14 +15,9 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH # export MANPATH="/usr/local/man:$MANPATH" plugins=( - pip python virtualenv virtualenvwrapper #meteor node npm ) -# virtualenvwrapper: -export WORKON_HOME=$HOME/.virtualenvs -source /usr/local/bin/virtualenvwrapper.sh - # Aliases if [ -f $ZCFG/dotfiles/zshrc.sh ]; then . $ZCFG/dotfiles/zshrc.sh -- 2.0.0