diff options
| author |  Jonas Gunz <himself@jonasgunz.de>
| 2020-11-18 23:26:24 +0100 |
|---|---|---|
| committer | Jonas Gunz <himself@jonasgunz.de>
| 2020-11-18 23:26:24 +0100 |
| commit | 6a2a08bc12c9c62befc08dc351ca7ac31818ab50 (patch) | |
| tree | db015b1e8f3222beefbea1b3f9827406422473eb | |
| parent | 5b4360a6b14a8574ee6e8ca4026f208e8ad210d2 (diff) | |
| parent | a63880722047e6bca33a6babf2291547280fb1c0 (diff) | |
| download | dotfiles-6a2a08bc12c9c62befc08dc351ca7ac31818ab50.tar.gz | |
Merge remote-tracking branch 'origin/master'
| l--------- | .vim/bundle-active/vim-pathogen | 1 | ||||
| -rw-r--r-- | bash/prompt.bash | 4 | ||||
| -rw-r--r-- | bash/vim-plugins.bash | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.vim/bundle-active/vim-pathogen b/.vim/bundle-active/vim-pathogen deleted file mode 120000 index 302f26a..0000000 --- a/.vim/bundle-active/vim-pathogen +++ /dev/null @@ -1 +0,0 @@ -../bundle/vim-pathogen/
\ No newline at end of file diff --git a/bash/prompt.bash b/bash/prompt.bash index c4c77fc..9e74155 100644 --- a/bash/prompt.bash +++ b/bash/prompt.bash @@ -3,12 +3,14 @@ function prompt_command () { local EXIT="$?" local REMOTE="" + local VENV="" [ $EXIT -eq 0 ] && EXIT="" [ ! -z "$SSH_CONNECTION" ] && REMOTE="${orange}[R] " + [ -z "$VIRTUAL_ENV" ] || VENV="$(basename "$VIRTUAL_ENV")" #PS1="\n${REMOTE}${cyan}\h:$(virtualenv_prompt) ${reset_color} ${yellow}\w ${green}$(scm_prompt_info)\n${red}${EXIT} ${reset_color}→ " - PS1="\n${REMOTE}${cyan}\h: ${reset_color} ${yellow}\w \n${red}${EXIT} ${reset_color}→ " + PS1="\n${REMOTE}${cyan}\h: ${reset_color} ${yellow}\w ${green}${VENV}\n${red}${EXIT} ${reset_color}→ " } PROMPT_COMMAND=prompt_command diff --git a/bash/vim-plugins.bash b/bash/vim-plugins.bash index 1b8d7c6..688d918 100644 --- a/bash/vim-plugins.bash +++ b/bash/vim-plugins.bash @@ -3,6 +3,7 @@ function vim-add() { local NAME=$(basename "$1") + [ -d "$DOTFILEBASE/.vim/bundle-active" ] || mkdir "$DOTFILEBASE/.vim/bundle-active" [ -d "$DOTFILEBASE/.vim/bundle/$NAME" ] || return 1 # no such plugin [ -L "$DOTFILEBASE/.vim/bundle-active/$NAME" ] && return 2 # Already exists |