b4093819a801e9c982b61718af75a188f34bd2bd
- Author
- Matsievskiy S.V <seregaxvm.main@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
fino: fix dangling "using" and clean up (#9307)
Co-authored-by: Matsievskiy S.V <matsievskiysv@gmail.com>
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
Diff
1diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
2index 1d8bb30e176529745fac190b7e21aa52a5939e5a..c5589f13ab2a9545beb0c6d69f52641ae5abce8c 100644
3--- a/themes/fino.zsh-theme
4+++ b/themes/fino.zsh-theme
5@@ -11,26 +11,35 @@
6 #
7 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
8
9+function virtualenv_prompt_info {
10+ [[ -n ${VIRTUAL_ENV} ]] || return
11+ echo "${ZSH_THEME_VIRTUALENV_PREFIX:=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX:=]}"
12+}
13+
14 function prompt_char {
15- git branch >/dev/null 2>/dev/null && echo "±" && return
16- echo '○'
17+ command git branch &>/dev/null && echo "±" || echo '○'
18 }
19
20 function box_name {
21- [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
22+ [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
23 }
24
25-local ruby_env='using%{$FG[243]%} $(ruby_prompt_info)'
26+local ruby_env='$(ruby_prompt_info)'
27 local git_info='$(git_prompt_info)'
28+local virtualenv_info='$(virtualenv_prompt_info)'
29 local prompt_char='$(prompt_char)'
30
31-
32-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}${git_info} %{$FG[239]%}${ruby_env}
33+PROMPT="╭─${FG[040]}%n ${FG[239]}at ${FG[033]}$(box_name) ${FG[239]}in %B${FG[226]}%~%{$reset_color%}${git_info}${ruby_env}${virtualenv_info}
34 ╰─${prompt_char}%{$reset_color%} "
35
36-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
37+ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[239]}on%{$reset_color%} ${FG[255]}"
38 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
39-ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
40-ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
41-ZSH_THEME_RUBY_PROMPT_PREFIX="‹"
42+ZSH_THEME_GIT_PROMPT_DIRTY="${FG[202]}✘✘✘"
43+ZSH_THEME_GIT_PROMPT_CLEAN="${FG[040]}✔"
44+
45+ZSH_THEME_RUBY_PROMPT_PREFIX=" ${FG[239]}using${FG[243]} ‹"
46 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
47+
48+export VIRTUAL_ENV_DISABLE_PROMPT=1
49+ZSH_THEME_VIRTUALENV_PREFIX=" ${FG[239]}using${FG[243]} «"
50+ZSH_THEME_VIRTUALENV_SUFFIX="»%{$reset_color%}"