Merge pull request #2060 from petarnikolovski/master

Author: seefood

themes/base.theme.bash

@@ -604,3 +604,11 @@ function _save-and-reload-history() {
 	[[ ${autosave} -eq 1 ]] && local HISTCONTROL="${HISTCONTROL:-}${HISTCONTROL:+:}autoshare"
 	_bash-it-history-auto-save && _bash-it-history-auto-load
 }
+
+function conda_or_venv_prompt() {
+	if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
+		condaenv_prompt
+	elif [[ -n "${VIRTUAL_ENV:-}" ]]; then
+		virtualenv_prompt
+	fi
+}

themes/robbyrussell/robbyrussell.theme.bash

@@ -13,13 +13,16 @@ GIT_THEME_PROMPT_SUFFIX="${bold_blue})"
 RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="|"
 
+VIRTUALENV_THEME_PROMPT_PREFIX='('
+VIRTUALENV_THEME_PROMPT_SUFFIX=') '
+
 function git_prompt_info() {
 	git_prompt_vars
 	echo -e "$SCM_PREFIX${bold_red}$SCM_BRANCH$SCM_STATE$SCM_SUFFIX"
 }
 
 function prompt_command() {
-	PS1="${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${normal} "
+  PS1="$(conda_or_venv_prompt)${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${normal} "
 }
 
 PROMPT_COMMAND=prompt_command