From a680dc8c1e50fdb82c0220e63c24ec73bebe6093 Mon Sep 17 00:00:00 2001 From: Daniel Kluge Date: Tue, 11 Jan 2022 17:41:12 +0100 Subject: [PATCH] More zsh --- .../themes/custom-robbyrussell.zsh-theme | 29 +++++++++++++++---- backup/.zshrc | 2 +- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/backup/.oh-my-zsh/themes/custom-robbyrussell.zsh-theme b/backup/.oh-my-zsh/themes/custom-robbyrussell.zsh-theme index f11d4cc..c488cb6 100644 --- a/backup/.oh-my-zsh/themes/custom-robbyrussell.zsh-theme +++ b/backup/.oh-my-zsh/themes/custom-robbyrussell.zsh-theme @@ -1,8 +1,27 @@ -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%} [%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[blue]%}]%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_ADDED="A" +ZSH_THEME_GIT_PROMPT_MODIFIED="M" +ZSH_THEME_GIT_PROMPT_DELETED="M" +ZSH_THEME_GIT_PROMPT_RENAMED="M" +ZSH_THEME_GIT_PROMPT_UNMERGED="" +ZSH_THEME_GIT_PROMPT_UNTRACKED="U" + +function my_git_color() { + local state="$(git_prompt_status)" + ZSH_THEME_GIT_PROMPT_PREFIX="%F{blue} [%f" + case "$state" in + *"A"*) ZSH_THEME_GIT_PROMPT_PREFIX+="%B%F{green}";; + *"M"*) ZSH_THEME_GIT_PROMPT_PREFIX+="%B%F{yellow}";; + *"U"*) ZSH_THEME_GIT_PROMPT_PREFIX+="%F{141}";; + *) ZSH_THEME_GIT_PROMPT_PREFIX+="%F{red}";; + esac +} + +ZSH_THEME_GIT_PROMPT_PREFIX="%F{blue} [%F{red}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%b%F{blue}]%f " ZSH_THEME_GIT_PROMPT_DIRTY="" ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_VIRTUALENV_PREFIX="%F{white}[%B%F{green}" +ZSH_THEME_VIRTUALENV_SUFFIX="%b%F{white}]%f " -PROMPT_CHAR="%{$fg_bold[gray]%}\$" -PROMPT="%(?:%{$fg_bold[green]%}➜:%{$fg_bold[red]%}➜)" -PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)$PROMPT_CHAR%{$reset_color%} ' +PROMPT_CHAR="%B%F{grey}\$%b%f" +PROMPT='%B%(?:%F{green}➜:%F{red}➜)%b %F{cyan}%c%f $(virtualenv_prompt_info)$(my_git_color)$(git_prompt_info)$PROMPT_CHAR%f ' diff --git a/backup/.zshrc b/backup/.zshrc index 328bc7b..611fd41 100644 --- a/backup/.zshrc +++ b/backup/.zshrc @@ -70,7 +70,7 @@ ZSH_THEME="custom-robbyrussell" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(colored-man-pages docker docker-compose git npm ubuntu) +plugins=(colored-man-pages docker docker-compose git npm ubuntu virtualenv) source $ZSH/oh-my-zsh.sh