mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-26 21:51:05 +01:00
Replace %{$fg[color]%} by %F{color} in themes
that only change the foreground color. %F works at least since Zsh 4.3.
This commit is contained in:
parent
db94f60d34
commit
e8504ac49a
21 changed files with 129 additions and 129 deletions
|
@ -1,24 +1,24 @@
|
||||||
|
|
||||||
local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
|
local user='%F{magenta}%n@%F{magenta}%m%f'
|
||||||
local pwd='%{$fg[blue]%}%~%{$reset_color%}'
|
local pwd='%F{blue}%~%f'
|
||||||
local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
|
local return_code='%(?..%F{red}%? ↵%f)'
|
||||||
local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
|
local git_branch='$(git_prompt_status)%f$(git_prompt_info)%f'
|
||||||
|
|
||||||
ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
|
ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%F{green}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
|
ZSH_THEME_GIT_PROMPT_ADDED="%F{green} ✚"
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue} ✹"
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
|
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖"
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
|
ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta} ➜"
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow} ═"
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭"
|
||||||
|
|
||||||
ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[green]%}‹"
|
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{green}‹"
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
|
||||||
|
|
||||||
PROMPT="${user} ${pwd}$ "
|
PROMPT="${user} ${pwd}$ "
|
||||||
RPROMPT="${return_code} ${git_branch} \$(ruby_prompt_info)"
|
RPROMPT="${return_code} ${git_branch} \$(ruby_prompt_info)"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
|
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
|
||||||
|
|
||||||
PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
|
PROMPT='%F{$NCOLOR}%c ➤ %f'
|
||||||
RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
|
RPROMPT='%F{$NCOLOR}%p $(git_prompt_info)%f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="git:"
|
ZSH_THEME_GIT_PROMPT_PREFIX="git:"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
# Colors are at the top so you can mess with those separately if you like.
|
# Colors are at the top so you can mess with those separately if you like.
|
||||||
# For the most part I stuck with Dallas's.
|
# For the most part I stuck with Dallas's.
|
||||||
|
|
||||||
CRUNCH_BRACKET_COLOR="%{$fg[white]%}"
|
CRUNCH_BRACKET_COLOR="%F{white}"
|
||||||
CRUNCH_TIME_COLOR="%{$fg[yellow]%}"
|
CRUNCH_TIME_COLOR="%F{yellow}"
|
||||||
CRUNCH_RVM_COLOR="%{$fg[magenta]%}"
|
CRUNCH_RVM_COLOR="%F{magenta}"
|
||||||
CRUNCH_DIR_COLOR="%{$fg[cyan]%}"
|
CRUNCH_DIR_COLOR="%F{cyan}"
|
||||||
CRUNCH_GIT_BRANCH_COLOR="%{$fg[green]%}"
|
CRUNCH_GIT_BRANCH_COLOR="%F{green}"
|
||||||
CRUNCH_GIT_CLEAN_COLOR="%{$fg[green]%}"
|
CRUNCH_GIT_CLEAN_COLOR="%F{green}"
|
||||||
CRUNCH_GIT_DIRTY_COLOR="%{$fg[red]%}"
|
CRUNCH_GIT_DIRTY_COLOR="%F{red}"
|
||||||
|
|
||||||
# These Git variables are used by the oh-my-zsh git_prompt_info helper:
|
# These Git variables are used by the oh-my-zsh git_prompt_info helper:
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR:$CRUNCH_GIT_BRANCH_COLOR"
|
ZSH_THEME_GIT_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR:$CRUNCH_GIT_BRANCH_COLOR"
|
||||||
|
@ -28,12 +28,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN=" $CRUNCH_GIT_CLEAN_COLOR✓"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
|
ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
|
||||||
|
|
||||||
# Our elements:
|
# Our elements:
|
||||||
CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
|
CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%f"
|
||||||
ZSH_THEME_RUBY_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR"
|
ZSH_THEME_RUBY_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR"
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX="$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="$CRUNCH_BRACKET_COLOR"]"%f"
|
||||||
CRUNCH_RVM_='$(ruby_prompt_info)'
|
CRUNCH_RVM_='$(ruby_prompt_info)'
|
||||||
CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
|
CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
|
||||||
CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
|
CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
|
||||||
|
|
||||||
# Put it all together!
|
# Put it all together!
|
||||||
PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%{$reset_color%}"
|
PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%f"
|
||||||
|
|
|
@ -1,27 +1,27 @@
|
||||||
# Personalized!
|
# Personalized!
|
||||||
|
|
||||||
# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
|
# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
|
||||||
DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
|
DALLAS_CURRENT_TIME_="%F{white}{%F{yellow}%D %T%F{white}}%f"
|
||||||
# Grab the current machine name: muscato
|
# Grab the current machine name: muscato
|
||||||
DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
|
DALLAS_CURRENT_MACH_="%F{green}%m%F{white}:%f"
|
||||||
# Grab the current filepath, use shortcuts: ~/Desktop
|
# Grab the current filepath, use shortcuts: ~/Desktop
|
||||||
# Append the current git branch, if in a git repository: ~aw@master
|
# Append the current git branch, if in a git repository: ~aw@master
|
||||||
DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)"
|
DALLAS_CURRENT_LOCA_="%F{cyan}%~\$(git_prompt_info)%f\$(parse_git_dirty)"
|
||||||
# Grab the current username: dallas
|
# Grab the current username: dallas
|
||||||
DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
|
DALLAS_CURRENT_USER_="%F{red}%n%f"
|
||||||
# Use a % for normal users and a # for privelaged (root) users.
|
# Use a % for normal users and a # for privelaged (root) users.
|
||||||
DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
|
DALLAS_PROMPT_CHAR_="%F{white}%(!.#.%%)%f"
|
||||||
# For the git prompt, use a white @ and blue text for the branch name
|
# For the git prompt, use a white @ and blue text for the branch name
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%F{white}@%F{blue}"
|
||||||
# Close it all off by resetting the color and styles.
|
# Close it all off by resetting the color and styles.
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
|
||||||
# Do nothing if the branch is clean (no changes).
|
# Do nothing if the branch is clean (no changes).
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
|
# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{cyan}✗✗✗"
|
||||||
|
|
||||||
ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[white]%}[%{$fg[magenta]%}"
|
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{white}[%F{magenta}"
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$fg[white]%}]%{$reset_color%}"
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="%F{white}]%f"
|
||||||
|
|
||||||
# Put it all together!
|
# Put it all together!
|
||||||
PROMPT="$DALLAS_CURRENT_TIME_\$(ruby_prompt_info)$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ "
|
PROMPT="$DALLAS_CURRENT_TIME_\$(ruby_prompt_info)$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ "
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Copied and modified from the oh-my-zsh theme from geoffgarside
|
# Copied and modified from the oh-my-zsh theme from geoffgarside
|
||||||
# Red server name, green cwd, blue git status
|
# Red server name, green cwd, blue git status
|
||||||
|
|
||||||
PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
|
PROMPT='%F{red}%m%f:%F{green}%c%f$(git_prompt_info) %(!.#.$) '
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}("
|
ZSH_THEME_GIT_PROMPT_PREFIX=" %F{blue}("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
|
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
|
||||||
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
local return_code="%(?..%F{red}%? ↵%f)"
|
||||||
|
|
||||||
PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\
|
PROMPT='%F{$NCOLOR}%n%f@%F{cyan}%m\
|
||||||
%{$reset_color%}:%{$fg[magenta]%}%~\
|
%f:%F{magenta}%~\
|
||||||
$(git_prompt_info) \
|
$(git_prompt_info) \
|
||||||
%{$fg[red]%}%(!.#.»)%{$reset_color%} '
|
%F{red}%(!.#.»)%f '
|
||||||
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
|
PROMPT2='%F{red}\ %f'
|
||||||
RPS1='${return_code}'
|
RPS1='${return_code}'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
|
ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}("
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}○%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_CLEAN="%F{green}○%f"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}⚡%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{red}⚡%f"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%})%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%F{yellow})%f"
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Taken from Tassilo's Blog
|
# Taken from Tassilo's Blog
|
||||||
# https://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/
|
# https://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/
|
||||||
|
|
||||||
local blue_op="%{$fg[blue]%}[%{$reset_color%}"
|
local blue_op="%F{blue}[%f"
|
||||||
local blue_cp="%{$fg[blue]%}]%{$reset_color%}"
|
local blue_cp="%F{blue}]%f"
|
||||||
local path_p="${blue_op}%~${blue_cp}"
|
local path_p="${blue_op}%~${blue_cp}"
|
||||||
local user_host="${blue_op}%n@%m${blue_cp}"
|
local user_host="${blue_op}%n@%m${blue_cp}"
|
||||||
local ret_status="${blue_op}%?${blue_cp}"
|
local ret_status="${blue_op}%?${blue_cp}"
|
||||||
local hist_no="${blue_op}%h${blue_cp}"
|
local hist_no="${blue_op}%h${blue_cp}"
|
||||||
local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})"
|
local smiley="%(?,%F{green}:%)%f,%F{red}:(%f)"
|
||||||
PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no}
|
PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no}
|
||||||
╰─${blue_op}${smiley}${blue_cp} %# "
|
╰─${blue_op}${smiley}${blue_cp} %# "
|
||||||
local cur_cmd="${blue_op}%_${blue_cp}"
|
local cur_cmd="${blue_op}%_${blue_cp}"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) "
|
# PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) "
|
||||||
PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
|
PROMPT='[%*] %F{cyan}%n%f:%F{green}%c%f$(git_prompt_info) %(!.#.$) '
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}git:("
|
ZSH_THEME_GIT_PROMPT_PREFIX=" %F{yellow}git:("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
|
||||||
|
|
|
@ -20,7 +20,7 @@ else
|
||||||
suffix="Gb"
|
suffix="Gb"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) greetings, earthling %{$fg[green]%}[%{$reset_color%}%{$TotalSize%}%{$suffix%}%{$fg[green]%}]%{$fg[red]%}$%{$reset_color%} ☞ '
|
PROMPT='%f%n %F{green}{%f%~%F{green}}%f$(git_prompt_info) greetings, earthling %F{green}[%f%{$TotalSize%}%{$suffix%}%F{green}]%F{red}$%f ☞ '
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}±("
|
ZSH_THEME_GIT_PROMPT_PREFIX="%F{red}±("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=");%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=");%f"
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
# http://zshwiki.org/home/config/prompt
|
# http://zshwiki.org/home/config/prompt
|
||||||
#
|
#
|
||||||
|
|
||||||
PROMPT="%{$fg[red]%}%%%{$reset_color%} "
|
PROMPT="%F{red}%%%f "
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
|
local smiley="%(?,%F{green}☺%f,%F{red}☹%f)"
|
||||||
|
|
||||||
local user="%{$fg[cyan]%}%n%{$reset_color%}"
|
local user="%F{cyan}%n%f"
|
||||||
local host="%{$fg[cyan]%}@%m%{$reset_color%}"
|
local host="%F{cyan}@%m%f"
|
||||||
local pwd="%{$fg[yellow]%}%~%{$reset_color%}"
|
local pwd="%F{yellow}%~%f"
|
||||||
|
|
||||||
PROMPT='${user}${host} ${pwd}
|
PROMPT='${user}${host} ${pwd}
|
||||||
${smiley} '
|
${smiley} '
|
||||||
|
|
||||||
RPROMPT='$(ruby_prompt_info) %{$fg[white]%}$(git_prompt_info)%{$reset_color%}'
|
RPROMPT='$(ruby_prompt_info) %F{white}$(git_prompt_info)%f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=""
|
ZSH_THEME_GIT_PROMPT_PREFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{red} ✗%f"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_CLEAN="%F{green} ✔%f"
|
||||||
|
|
||||||
ZSH_THEME_RUBY_PROMPT_PREFIX=""
|
ZSH_THEME_RUBY_PROMPT_PREFIX=""
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX=""
|
ZSH_THEME_RUBY_PROMPT_SUFFIX=""
|
||||||
|
|
|
@ -7,6 +7,6 @@ function get_host {
|
||||||
PROMPT='> '
|
PROMPT='> '
|
||||||
RPROMPT='%~$(git_prompt_info)$(get_host)'
|
RPROMPT='%~$(git_prompt_info)$(get_host)'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}✗%f"
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
|
|
@ -1,25 +1,25 @@
|
||||||
# kphoen.zsh-theme
|
# kphoen.zsh-theme
|
||||||
|
|
||||||
if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
|
if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
|
||||||
PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
|
PROMPT='[%F{red}%n%f@%F{magenta}%m%f:%F{blue}%~%f$(git_prompt_info)]
|
||||||
%# '
|
%# '
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX=" on %F{green}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
# display exitcode on the right when >0
|
# display exitcode on the right when >0
|
||||||
return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
return_code="%(?..%F{red}%? ↵%f)"
|
||||||
|
|
||||||
RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}'
|
RPROMPT='${return_code}$(git_prompt_status)%f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
|
ZSH_THEME_GIT_PROMPT_ADDED="%F{green} ✚"
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue} ✹"
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
|
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖"
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
|
ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta} ➜"
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow} ═"
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭"
|
||||||
else
|
else
|
||||||
PROMPT='[%n@%m:%~$(git_prompt_info)]
|
PROMPT='[%n@%m:%~$(git_prompt_info)]
|
||||||
%# '
|
%# '
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
|
PROMPT='λ %~/ $(git_prompt_info)%f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%F{green}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Theme with full path names and hostname
|
# Theme with full path names and hostname
|
||||||
# Handy if you work on different servers all the time;
|
# Handy if you work on different servers all the time;
|
||||||
PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%}$(git_prompt_info) %(!.#.$) '
|
PROMPT='%F{cyan}%n%f@%F{yellow}%M:%F{green}%/%f$(git_prompt_info) %(!.#.$) '
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:("
|
ZSH_THEME_GIT_PROMPT_PREFIX=" %F{cyan}git:("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Yay! High voltage and arrows!
|
# Yay! High voltage and arrows!
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%f%F{green}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
PROMPT='%{$fg[cyan]%}%1~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%} '
|
PROMPT='%F{cyan}%1~%f%F{red}|%f$(git_prompt_info)%F{cyan}⇒%f '
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
PROMPT='%{$fg[yellow]%}λ %m %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)$(hg_prompt_info)%{$reset_color%}'
|
PROMPT='%F{yellow}λ %m %F{green}%c %F{yellow}→ $(git_prompt_info)$(hg_prompt_info)%f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="λ %F{blue}git %F{red}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%F{yellow} → %f"
|
||||||
ZSH_THEME_HG_PROMPT_PREFIX="λ %{$fg[blue]%}hg %{$fg[red]%}"
|
ZSH_THEME_HG_PROMPT_PREFIX="λ %F{blue}hg %F{red}"
|
||||||
ZSH_THEME_HG_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"
|
ZSH_THEME_HG_PROMPT_SUFFIX="%F{yellow} → %f"
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ function _virtualenv_prompt_info {
|
||||||
if [[ -n "$(whence virtualenv_prompt_info)" ]]; then
|
if [[ -n "$(whence virtualenv_prompt_info)" ]]; then
|
||||||
if [ -n "$(whence pyenv_prompt_info)" ]; then
|
if [ -n "$(whence pyenv_prompt_info)" ]; then
|
||||||
if [ "$1" = "inline" ]; then
|
if [ "$1" = "inline" ]; then
|
||||||
ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=%{$fg[blue]%}"::%{$fg[red]%}"
|
ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=%F{blue}"::%F{red}"
|
||||||
ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX=""
|
ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX=""
|
||||||
virtualenv_prompt_info
|
virtualenv_prompt_info
|
||||||
fi
|
fi
|
||||||
|
@ -17,13 +17,13 @@ function _virtualenv_prompt_info {
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_setup_pygmalion(){
|
prompt_setup_pygmalion(){
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%f%F{green}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
base_prompt='$(_virtualenv_prompt_info)%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
|
base_prompt='$(_virtualenv_prompt_info)%F{magenta}%n%f%F{cyan}@%f%F{yellow}%m%f%F{red}:%f%F{cyan}%0~%f%F{red}|%f'
|
||||||
post_prompt='%{$fg[cyan]%}⇒%{$reset_color%} '
|
post_prompt='%F{cyan}⇒%f '
|
||||||
|
|
||||||
base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
||||||
post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PROMPT='%{$fg[white]%}%c$(git_prompt_info)$ % %{$reset_color%}'
|
PROMPT='%F{white}%c$(git_prompt_info)$ % %f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
# Comment
|
# Comment
|
||||||
|
|
||||||
PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
|
PROMPT='%F{magenta}[%c] %f'
|
||||||
|
|
||||||
RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
|
RPROMPT='%F{magenta}$(git_prompt_info)%f $(git_prompt_status)%f'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=""
|
ZSH_THEME_GIT_PROMPT_PREFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
|
ZSH_THEME_GIT_PROMPT_ADDED="%F{cyan} ✈"
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{yellow} ✭"
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
|
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✗"
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
|
ZSH_THEME_GIT_PROMPT_RENAMED="%F{blue} ➦"
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{magenta} ✂"
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{grey} ✱"
|
||||||
|
|
|
@ -21,35 +21,35 @@
|
||||||
|
|
||||||
# The prompt
|
# The prompt
|
||||||
|
|
||||||
PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
|
PROMPT='%F{magenta}[%c] %f'
|
||||||
|
|
||||||
# The right-hand prompt
|
# The right-hand prompt
|
||||||
|
|
||||||
RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
|
RPROMPT='${time} %F{magenta}$(git_prompt_info)%f$(git_prompt_status)%f$(git_prompt_ahead)%f'
|
||||||
|
|
||||||
# Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
|
# Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
|
||||||
# $(ruby_prompt_info)
|
# $(ruby_prompt_info)
|
||||||
|
|
||||||
# local time, color coded by last return code
|
# local time, color coded by last return code
|
||||||
time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
|
time_enabled="%(?.%F{green}.%F{red})%*%f"
|
||||||
time_disabled="%{$fg[green]%}%*%{$reset_color%}"
|
time_disabled="%F{green}%*%f"
|
||||||
time=$time_enabled
|
time=$time_enabled
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" ☁ %{$fg[red]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX=" ☁ %F{red}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%} ☂" # Ⓓ
|
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow} ☂" # Ⓓ
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" # ⓣ
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭" # ⓣ
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ☀" # Ⓞ
|
ZSH_THEME_GIT_PROMPT_CLEAN="%F{green} ☀" # Ⓞ
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✚" # ⓐ ⑃
|
ZSH_THEME_GIT_PROMPT_ADDED="%F{cyan} ✚" # ⓐ ⑃
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡" # ⓜ ⑁
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{yellow} ⚡" # ⓜ ⑁
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂
|
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖" # ⓧ ⑂
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄
|
ZSH_THEME_GIT_PROMPT_RENAMED="%F{blue} ➜" # ⓡ ⑄
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{magenta} ♒" # ⓤ ⑊
|
||||||
ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙"
|
ZSH_THEME_GIT_PROMPT_AHEAD="%F{blue} 𝝙"
|
||||||
|
|
||||||
ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[yellow]%}"
|
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{yellow}"
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="%f"
|
||||||
|
|
||||||
# More symbols to choose from:
|
# More symbols to choose from:
|
||||||
# ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
|
# ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
|
||||||
|
@ -60,7 +60,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
function rvm_gemset() {
|
function rvm_gemset() {
|
||||||
GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
|
GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
|
||||||
if [[ -n $GEMSET ]]; then
|
if [[ -n $GEMSET ]]; then
|
||||||
echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
|
echo "%F{yellow}$GEMSET%f|"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,11 +97,11 @@ function git_time_since_commit() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$HOURS" -gt 24 ]; then
|
if [ "$HOURS" -gt 24 ]; then
|
||||||
echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%f|"
|
||||||
elif [ "$MINUTES" -gt 60 ]; then
|
elif [ "$MINUTES" -gt 60 ]; then
|
||||||
echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%f|"
|
||||||
else
|
else
|
||||||
echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
|
echo "($(rvm_gemset)$COLOR${MINUTES}m%f|"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||||
|
|
Loading…
Reference in a new issue