mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-27 03:05:39 +01:00
color variables are now declared locally to avoid name clashes - closing issue #2665
This commit is contained in:
parent
14db6642d9
commit
9b0189738f
1 changed files with 31 additions and 28 deletions
|
|
@ -1,44 +1,47 @@
|
||||||
|
# Michele Bologna theme
|
||||||
|
# mbologna on GitHub
|
||||||
|
#
|
||||||
# reference colors
|
# reference colors
|
||||||
GREEN="%{$fg_bold[green]%}"
|
local GREEN="%{$fg_bold[green]%}"
|
||||||
RED="%{$fg_bold[red]%}"
|
local RED="%{$fg_bold[red]%}"
|
||||||
CYAN="%{$fg_bold[cyan]%}"
|
local CYAN="%{$fg_bold[cyan]%}"
|
||||||
YELLOW="%{$fg_bold[yellow]%}"
|
local YELLOW="%{$fg_bold[yellow]%}"
|
||||||
BLUE="%{$fg_bold[blue]%}"
|
local BLUE="%{$fg_bold[blue]%}"
|
||||||
MAGENTA="%{$fg_bold[magenta]%}"
|
local MAGENTA="%{$fg_bold[magenta]%}"
|
||||||
WHITE="%{$fg_bold[white]%}"
|
local WHITE="%{$fg_bold[white]%}"
|
||||||
|
|
||||||
|
local COLOR_ARRAY
|
||||||
COLOR_ARRAY=($GREEN $RED $CYAN $YELLOW $BLUE $MAGENTA $WHITE)
|
COLOR_ARRAY=($GREEN $RED $CYAN $YELLOW $BLUE $MAGENTA $WHITE)
|
||||||
|
|
||||||
# color reset
|
# color reset
|
||||||
RESET_COLOR="%{$reset_color%}"
|
local RESET_COLOR="%{$reset_color%}"
|
||||||
|
|
||||||
# which color should be applied?
|
# which color should be applied?
|
||||||
USERNAME_NORMAL_COLOR=$WHITE
|
local USERNAME_NORMAL_COLOR=$WHITE
|
||||||
USERNAME_ROOT_COLOR=$RED
|
local USERNAME_ROOT_COLOR=$RED
|
||||||
HOSTNAME_NORMAL_COLOR=$BLUE
|
for i in `hostname`; local HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
|
||||||
# uncomment next line if you want auto-generated hostname color
|
local HOSTNAME_ROOT_COLOR=$RED
|
||||||
#for i in `hostname`; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
|
local HOSTNAME_COLOR
|
||||||
HOSTNAME_ROOT_COLOR=$RED
|
|
||||||
HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR)
|
HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR)
|
||||||
CURRENT_DIR_COLOR=$CYAN
|
local CURRENT_DIR_COLOR=$CYAN
|
||||||
|
|
||||||
# zsh commands
|
# zsh commands
|
||||||
USERNAME_COMMAND="%n"
|
local USERNAME_COMMAND="%n"
|
||||||
HOSTNAME_COMMAND="%m"
|
local HOSTNAME_COMMAND="%m"
|
||||||
CURRENT_DIR="%~"
|
local CURRENT_DIR="%~"
|
||||||
|
|
||||||
# output: colors + commands
|
# output: colors + commands
|
||||||
USERNAME_OUTPUT="%(!..$USERNAME_NORMAL_COLOR$USERNAME_COMMAND$RESET_COLOR@)"
|
local USERNAME_OUTPUT="%(!..$USERNAME_NORMAL_COLOR$USERNAME_COMMAND$RESET_COLOR@)"
|
||||||
HOSTNAME_OUTPUT="$HOSTNAME_COLOR$HOSTNAME_COMMAND$RESET_COLOR"
|
local HOSTNAME_OUTPUT="$HOSTNAME_COLOR$HOSTNAME_COMMAND$RESET_COLOR"
|
||||||
CURRENT_DIR_OUTPUT="$CURRENT_DIR_COLOR$CURRENT_DIR"
|
local CURRENT_DIR_OUTPUT="$CURRENT_DIR_COLOR$CURRENT_DIR"
|
||||||
LAST_COMMAND_OUTPUT="%(?.%(!.$RED.$GREEN).$YELLOW)"
|
local LAST_COMMAND_OUTPUT="%(?.%(!.$RED.$GREEN).$YELLOW)"
|
||||||
|
|
||||||
# git theming
|
# git theming
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
local ZSH_THEME_GIT_PROMPT_PREFIX="("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
local ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=")$RED*"
|
local ZSH_THEME_GIT_PROMPT_DIRTY=")$RED*"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=")"
|
local ZSH_THEME_GIT_PROMPT_CLEAN=")"
|
||||||
|
|
||||||
# wrap all together
|
# wrap all together
|
||||||
PROMPT='$USERNAME_OUTPUT$HOSTNAME_OUTPUT:$CURRENT_DIR_OUTPUT $LAST_COMMAND_OUTPUT%#$RESET_COLOR '
|
export PROMPT='$USERNAME_OUTPUT$HOSTNAME_OUTPUT:$CURRENT_DIR_OUTPUT $LAST_COMMAND_OUTPUT%#$RESET_COLOR '
|
||||||
RPROMPT='%1(j.fg: [%j].) $GREEN$(git_prompt_info)$RESET_COLOR [%@]'
|
export RPROMPT='%1(j.fg: [%j].) $GREEN$(git_prompt_info)$RESET_COLOR [%@]'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue