linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

avit: clean up theme code

Browse source
This commit is contained in:
Marc Cornellà 2020-02-19 17:24:20 +01:00
parent 443ad88024
commit 77813a330b
1 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
themes/avit.zsh-theme
View file

@ -1,27 +1,20 @@
# AVIT ZSH Theme # AVIT ZSH Theme
# settings
typeset +H _current_dir="%{$fg_bold[blue]%}%3~%{$reset_color%} "
typeset +H _return_status="%{$fg_bold[red]%}%(?..⍉)%{$reset_color%}"
typeset +H _hist_no="%{$fg[grey]%}%h%{$reset_color%}"
PROMPT=' PROMPT='
$(_user_host)${_current_dir} $(git_prompt_info) $(ruby_prompt_info) $(_user_host)${_current_dir} $(git_prompt_info) $(ruby_prompt_info)
%{$fg[$CARETCOLOR]%}▶%{$resetcolor%} ' %{%F{%(!.red.white)}%}▶%{$resetcolor%} '
PROMPT2='%{$fg[$CARETCOLOR]%}◀%{$reset_color%} ' PROMPT2='%{%F{%(!.red.white)}%}◀%{$reset_color%} '
RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}' RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
local _current_dir="%{$fg_bold[blue]%}%3~%{$reset_color%} "
local _return_status="%{$fg_bold[red]%}%(?..⍉)%{$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() {
local me
if [[ -n $SSH_CONNECTION ]]; then if [[ -n $SSH_CONNECTION ]]; then
me="%n@%m" me="%n@%m"
elif [[ $LOGNAME != $USER ]]; then elif [[ $LOGNAME != $USER ]]; then
@ -35,6 +28,8 @@ function _user_host() {
# Determine the time since last commit. If branch is clean, # Determine the time since last commit. If branch is clean,
# use a neutral color, otherwise colors will vary according to time. # use a neutral color, otherwise colors will vary according to time.
function _git_time_since_commit() { function _git_time_since_commit() {
local last_commit now seconds_since_last_commit
local minutes hours commit_age
# Only proceed if there is actually a commit. # Only proceed if there is actually a commit.
if last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null); then if last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null); then
now=$(date +%s) now=$(date +%s)
@ -44,30 +39,18 @@ function _git_time_since_commit() {
minutes=$((seconds_since_last_commit / 60)) minutes=$((seconds_since_last_commit / 60))
hours=$((seconds_since_last_commit / 3600)) hours=$((seconds_since_last_commit / 3600))
# Sub-hours and sub-minutes if [[ $hours -ge 24 ]]; then
days=$((seconds_since_last_commit / 86400)) commit_age="$(( hours / 24 ))d"
sub_hours=$((hours % 24)) elif [[ $hours -gt 0 ]]; then
sub_minutes=$((minutes % 60)) commit_age+="$(( hours % 24 ))h$(( minutes % 60 ))m"
if [ $hours -ge 24 ]; then
commit_age="${days}d"
elif [ $minutes -gt 60 ]; then
commit_age="${sub_hours}h${sub_minutes}m"
else else
commit_age="${minutes}m" commit_age="${minutes}m"
fi fi
color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL echo "${ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL}${commit_age}%{$reset_color%}"
echo "$color$commit_age%{$reset_color%}"
fi fi
} }
if [[ $USER == "root" ]]; then
CARETCOLOR="red"
else
CARETCOLOR="white"
fi
MODE_INDICATOR="%{$fg_bold[yellow]%}❮%{$reset_color%}%{$fg[yellow]%}❮❮%{$reset_color%}" MODE_INDICATOR="%{$fg_bold[yellow]%}❮%{$reset_color%}%{$fg[yellow]%}❮❮%{$reset_color%}"
# Git prompt settings # Git prompt settings