Merge pull request #280 from hawkbee/hawkbee
Add git config option bash-it.hide-status to decide whether check git st...
diff --git a/completion/available/conda.completion.bash b/completion/available/conda.completion.bash
new file mode 100644
index 0000000..cb5a15d
--- /dev/null
+++ b/completion/available/conda.completion.bash
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+which register-python-argcomplete > /dev/null \
+ && eval "$(register-python-argcomplete conda)" \
+ || echo "Please install argcomplete to use conda completion"
diff --git a/install.sh b/install.sh
index 46edcf2..4c0bf08 100755
--- a/install.sh
+++ b/install.sh
@@ -36,7 +36,7 @@
[ ${filename:0:1} = "_" ] && continue
dest="${BASH_IT}/${file_type}/enabled/${filename}"
if [ ! -e "${dest}" ]; then
- ln -s "${src}" "${dest}"
+ ln -s "../available/${filename}" "${dest}"
else
echo "File ${dest} exists, skipping"
fi
@@ -57,7 +57,7 @@
read -p "Would you like to enable the ${file_name%%.*} $file_type? [Y/N] " RESP
case $RESP in
[yY])
- ln -s "$path" "$BASH_IT/$file_type/enabled"
+ ln -s "../available/${file_name}" "$BASH_IT/$file_type/enabled"
break
;;
[nN])
diff --git a/lib/helpers.bash b/lib/helpers.bash
index b99ae3d..4c39704 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -261,7 +261,7 @@
do
plugin=$(basename $f)
if [ ! -h $BASH_IT/$subdirectory/enabled/$plugin ]; then
- ln -s $BASH_IT/$subdirectory/available/$plugin $BASH_IT/$subdirectory/enabled/$plugin
+ ln -s ../available/$plugin $BASH_IT/$subdirectory/enabled/$plugin
fi
done
else
@@ -279,7 +279,7 @@
mkdir -p $BASH_IT/$subdirectory/enabled
- ln -s $BASH_IT/$subdirectory/available/$plugin $BASH_IT/$subdirectory/enabled/$plugin
+ ln -s ../available/$plugin $BASH_IT/$subdirectory/enabled/$plugin
fi
printf '%s\n' "$file_entity enabled."
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 81598de..012f933 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -53,9 +53,16 @@
}
function powerline_virtualenv_prompt {
- if [[ -n "$VIRTUAL_ENV" ]]; then
- virtualenv=$(basename "$VIRTUAL_ENV")
- VIRTUALENV_PROMPT="$(set_rgb_color ${LAST_THEME_COLOR} ${VIRTUALENV_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}$(set_rgb_color - ${VIRTUALENV_THEME_PROMPT_COLOR}) ${VIRTUALENV_CHAR}$virtualenv ${normal}"
+ local environ=""
+
+ if [[ -n "$CONDA_DEFAULT_ENV" ]]; then
+ environ="conda: $CONDA_DEFAULT_ENV"
+ elif [[ -n "$VIRTUAL_ENV" ]]; then
+ environ=$(basename "$VIRTUAL_ENV")
+ fi
+
+ if [[ -n "$environ" ]]; then
+ VIRTUALENV_PROMPT="$(set_rgb_color ${LAST_THEME_COLOR} ${VIRTUALENV_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}$(set_rgb_color - ${VIRTUALENV_THEME_PROMPT_COLOR}) ${VIRTUALENV_CHAR}$environ ${normal}"
LAST_THEME_COLOR=${VIRTUALENV_THEME_PROMPT_COLOR}
else
VIRTUALENV_PROMPT=""