linux/ohmyzsh
0
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-19 04:01:21 +02:00
Code Issues Projects Releases Wiki Activity

style(af-magic): fix code style and remove unnecessary variables

Browse source
This commit is contained in:
Marc Cornellà 2021-11-30 18:07:42 +01:00
parent 1c07001896
commit c172624398
No known key found for this signature in database
GPG key ID: 0314585E776A9C1B
1 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
themes/af-magic.zsh-theme
View file

@ -1,47 +1,46 @@
# af-magic.zsh-theme # af-magic.zsh-theme
# Repo: https://github.com/andyfleming/oh-my-zsh #
# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme # Author: Andy Fleming
# URL: http://andyfleming.com/
# dashed separator size
# settings
typeset +H return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
typeset +H my_gray="$FG[237]"
typeset +H my_orange="$FG[214]"
# separator dashes size
function afmagic_dashes { function afmagic_dashes {
local PYTHON_ENV="$VIRTUAL_ENV" # check either virtualenv or condaenv variables
[[ -z "$PYTHON_ENV" ]] && PYTHON_ENV="$CONDA_DEFAULT_ENV" local python_env="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
if [[ -n "$PYTHON_ENV" && "$PS1" = \(* ]]; then # if there is a python virtual environment and it is displayed in
echo $(( COLUMNS - ${#PYTHON_ENV} - 3 )) # the prompt, account for it when returning the number of dashes
if [[ -n "$python_env" && "$PS1" = \(* ]]; then
echo $(( COLUMNS - ${#python_env} - 3 ))
else else
echo $COLUMNS echo $COLUMNS
fi fi
} }
# primary prompt # primary prompt: dashed separator, directory and vcs info
PS1='$FG[237]${(l.$(afmagic_dashes)..-.)}%{$reset_color%} PS1="${FG[237]}\${(l.\$(afmagic_dashes)..-.)}%{$reset_color%}
$FG[032]%~$(git_prompt_info)$(hg_prompt_info) $FG[105]%(!.#.»)%{$reset_color%} ' ${FG[032]}%~\$(git_prompt_info)\$(hg_prompt_info) ${FG[105]}%(!.#.»)%{$reset_color%} "
PS2='%{$fg[red]%}\ %{$reset_color%}' PS2="%{$fg[red]%}\ %{$reset_color%}"
RPS1='${return_code}'
# right prompt # right prompt: return code, virtualenv and context (user@host)
(( $+functions[virtualenv_prompt_info] )) && RPS1+='$(virtualenv_prompt_info)' RPS1="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
RPS1+=' $my_gray%n@%m%{$reset_color%}%' if (( $+functions[virtualenv_prompt_info] )); then
RPS1+='$(virtualenv_prompt_info)'
fi
RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
# git settings # git settings
ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]" ZSH_THEME_GIT_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
ZSH_THEME_GIT_PROMPT_CLEAN="" ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
# hg settings # hg settings
ZSH_THEME_HG_PROMPT_PREFIX="$FG[075]($FG[078]" ZSH_THEME_HG_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
ZSH_THEME_HG_PROMPT_CLEAN="" ZSH_THEME_HG_PROMPT_CLEAN=""
ZSH_THEME_HG_PROMPT_DIRTY="$my_orange*%{$reset_color%}" ZSH_THEME_HG_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
ZSH_THEME_HG_PROMPT_SUFFIX="$FG[075])%{$reset_color%}" ZSH_THEME_HG_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
# virtualenv settings # virtualenv settings
ZSH_THEME_VIRTUALENV_PREFIX=" $FG[075][" ZSH_THEME_VIRTUALENV_PREFIX=" ${FG[075]}["
ZSH_THEME_VIRTUALENV_SUFFIX="]%{$reset_color%}" ZSH_THEME_VIRTUALENV_SUFFIX="]%{$reset_color%}"