mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-22 13:50:09 +00:00
Merge pull request #4790 from lckarssen/avit-theme-fixes
Avit theme fixes
This commit is contained in:
commit
83cf8dc16f
2 changed files with 22 additions and 7 deletions
|
@ -2,16 +2,25 @@
|
||||||
|
|
||||||
PROMPT='
|
PROMPT='
|
||||||
$(_user_host)${_current_dir} $(git_prompt_info) $(_ruby_version)
|
$(_user_host)${_current_dir} $(git_prompt_info) $(_ruby_version)
|
||||||
▶ '
|
%{$fg[$CARETCOLOR]%}▶%{$resetcolor%} '
|
||||||
|
|
||||||
PROMPT2='%{$fg[grey]%}◀%{$reset_color%} '
|
PROMPT2='%{$fg[$CARETCOLOR]%}◀%{$reset_color%} '
|
||||||
|
|
||||||
RPROMPT='$(_vi_status)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
|
RPROMPT='$(_vi_status)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
|
||||||
|
|
||||||
local _current_dir="%{$fg[blue]%}%3~%{$reset_color%} "
|
local _current_dir="%{$fg_bold[blue]%}%3~%{$reset_color%} "
|
||||||
local _return_status="%{$fg[red]%}%(?..⍉)%{$reset_color%}"
|
local _return_status="%{$fg_bold[red]%}%(?..⍉)%{$reset_color%}"
|
||||||
local _hist_no="%{$fg[grey]%}%h%{$reset_color%}"
|
local _hist_no="%{$fg[grey]%}%h%{$reset_color%}"
|
||||||
|
|
||||||
|
function _current_dir() {
|
||||||
|
local _max_pwd_length="65"
|
||||||
|
if [[ $(echo -n $PWD | wc -c) -gt ${_max_pwd_length} ]]; then
|
||||||
|
echo "%{$fg_bold[blue]%}%-2~ ... %3~%{$reset_color%} "
|
||||||
|
else
|
||||||
|
echo "%{$fg_bold[blue]%}%~%{$reset_color%} "
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
function _user_host() {
|
function _user_host() {
|
||||||
if [[ -n $SSH_CONNECTION ]]; then
|
if [[ -n $SSH_CONNECTION ]]; then
|
||||||
me="%n@%m"
|
me="%n@%m"
|
||||||
|
@ -85,13 +94,13 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}⚑ "
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✖ "
|
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✖ "
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}▴ "
|
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}▴ "
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[cyan]%}§ "
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[cyan]%}§ "
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}◒ "
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[white]%}◒ "
|
||||||
|
|
||||||
# Colors vary depending on time lapsed.
|
# Colors vary depending on time lapsed.
|
||||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
|
ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
|
||||||
ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
|
ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
|
||||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
|
ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
|
||||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[grey]%}"
|
ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[white]%}"
|
||||||
|
|
||||||
# LS colors, made with http://geoff.greer.fm/lscolors/
|
# LS colors, made with http://geoff.greer.fm/lscolors/
|
||||||
export LSCOLORS="exfxcxdxbxegedabagacad"
|
export LSCOLORS="exfxcxdxbxegedabagacad"
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
|
# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
|
||||||
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
||||||
|
|
||||||
|
|
||||||
|
if [[ $UID -eq 0 ]]; then
|
||||||
|
local user_host='%{$terminfo[bold]$fg[red]%}%n@%m%{$reset_color%}'
|
||||||
|
else
|
||||||
local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
|
local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
|
||||||
|
fi
|
||||||
|
|
||||||
local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
|
local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
|
||||||
local rvm_ruby=''
|
local rvm_ruby=''
|
||||||
if which rvm-prompt &> /dev/null; then
|
if which rvm-prompt &> /dev/null; then
|
||||||
|
|
Loading…
Reference in a new issue