From 18ce8aae0a435627bb314837fc22e2f33edba9a4 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Fri, 29 Jan 2021 14:16:57 +0800 Subject: [PATCH 01/10] custom passion theme --- dash-passion.zsh-theme | 230 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 dash-passion.zsh-theme diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme new file mode 100644 index 0000000..cb8727d --- /dev/null +++ b/dash-passion.zsh-theme @@ -0,0 +1,230 @@ + +# gdate for macOS +# REF: https://apple.stackexchange.com/questions/135742/time-in-milliseconds-since-epoch-in-the-terminal +if [[ "$OSTYPE" == "darwin"* ]]; then + { + gdate + } || { + echo "\n$fg_bold[yellow]passsion.zsh-theme depends on cmd [gdate] to get current time in milliseconds$reset_color" + echo "$fg_bold[yellow][gdate] is not installed by default in macOS$reset_color" + echo "$fg_bold[yellow]to get [gdate] by running:$reset_color" + echo "$fg_bold[green]brew install coreutils;$reset_color"; + echo "$fg_bold[yellow]\nREF: https://github.com/ChesterYue/ohmyzsh-theme-passion#macos\n$reset_color" + } +fi + + +# time +function real_time() { + local color="%{$fg_no_bold[cyan]%}"; # color in PROMPT need format in %{XXX%} which is not same with echo + local time="[$(date +%H:%M:%S)]"; + local color_reset="%{$reset_color%}"; + echo "${color}${time}${color_reset}"; +} + +# login_info +function login_info() { + local color="%{$fg_no_bold[cyan]%}"; # color in PROMPT need format in %{XXX%} which is not same with echo + local ip + if [[ "$OSTYPE" == "linux-gnu" ]]; then + # Linux + ip="$(ifconfig | grep ^eth1 -A 1 | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | head -1)"; + elif [[ "$OSTYPE" == "darwin"* ]]; then + # macOS + ip="$(ifconfig | grep ^en1 -A 4 | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | head -1)"; + elif [[ "$OSTYPE" == "cygwin" ]]; then + # POSIX compatibility layer and Linux environment emulation for Windows + elif [[ "$OSTYPE" == "msys" ]]; then + # Lightweight shell and GNU utilities compiled for Windows (part of MinGW) + elif [[ "$OSTYPE" == "win32" ]]; then + # I'm not sure this can happen. + elif [[ "$OSTYPE" == "freebsd"* ]]; then + # ... + else + # Unknown. + fi + local color_reset="%{$reset_color%}"; + echo "${color}[%n@${ip}]${color_reset}"; +} + + +# directory +function directory() { + local color="%{$fg_no_bold[cyan]%}"; + # REF: https://stackoverflow.com/questions/25944006/bash-current-working-directory-with-replacing-path-to-home-folder + local directory="${PWD/#$HOME/~}"; + local color_reset="%{$reset_color%}"; + echo "${color}[${directory}]${color_reset}"; +} + + +# git +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[blue]%}git(%{$fg_no_bold[red]%}"; +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "; +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) 🔥"; +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[blue]%})"; + +function update_git_status() { + GIT_STATUS=$(git_prompt_info); +} + +function git_status() { + echo "${GIT_STATUS}" +} + + +# command +function update_command_status() { + local arrow=""; + local color_reset="%{$reset_color%}"; + local reset_font="%{$fg_no_bold[white]%}"; + COMMAND_RESULT=$1; + export COMMAND_RESULT=$COMMAND_RESULT + if $COMMAND_RESULT; + then + arrow="%{$fg_bold[red]%}❱%{$fg_bold[yellow]%}❱%{$fg_bold[green]%}❱"; + else + arrow="%{$fg_bold[red]%}❱❱❱"; + fi + COMMAND_STATUS="${arrow}${reset_font}${color_reset}"; +} +update_command_status true; + +function command_status() { + echo "${COMMAND_STATUS}" +} + +# settings +typeset +H return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" +typeset +H my_gray="$FG[237]" +typeset +H my_orange="$FG[214]" + +# separator dashes size +function afmagic_dashes { + local ratio=0.9 + echo $((COLUMNS * ratio)) +} + +# output command execute after +output_command_execute_after() { + if [ "$COMMAND_TIME_BEIGIN" = "-20200325" ] || [ "$COMMAND_TIME_BEIGIN" = "" ]; + then + return 1; + fi + + # cmd + local cmd="${$(fc -l | tail -1)#* }"; + local color_cmd=""; + if $1; + then + color_cmd="$fg_no_bold[green]"; + else + color_cmd="$fg_bold[red]"; + fi + local color_reset="$reset_color"; + cmd="${color_cmd}${cmd}${color_reset}" + + # time + local time="[$(date +%H:%M:%S)]" + local color_time="$fg_no_bold[cyan]"; + time="${color_time}${time}${color_reset}"; + + # cost + local time_end="$(current_time_millis)"; + local cost=$(bc -l <<<"${time_end}-${COMMAND_TIME_BEIGIN}"); + COMMAND_TIME_BEIGIN="-20200325" + local length_cost=${#cost}; + if [ "$length_cost" = "4" ]; + then + cost="0${cost}" + fi + cost="[cost ${cost}s]" + local color_cost="$fg_no_bold[yellow]"; + cost="${color_cost}${cost}${color_reset}"; + + echo -e "${time} ${cost} ${cmd}"; + echo -e ""; + local echo_dark_gray="\033[2;49;39m" + + echo -e "$echo_dark_gray${(l.$(afmagic_dashes)..-.)}${color_reset}" +} + + +# command execute before +# REF: http://zsh.sourceforge.net/Doc/Release/Functions.html +preexec() { + COMMAND_TIME_BEIGIN="$(current_time_millis)"; +} + +current_time_millis() { + local time_millis; + if [[ "$OSTYPE" == "linux-gnu" ]]; then + # Linux + time_millis="$(date +%s.%3N)"; + elif [[ "$OSTYPE" == "darwin"* ]]; then + # macOS + time_millis="$(gdate +%s.%3N)"; + elif [[ "$OSTYPE" == "cygwin" ]]; then + # POSIX compatibility layer and Linux environment emulation for Windows + elif [[ "$OSTYPE" == "msys" ]]; then + # Lightweight shell and GNU utilities compiled for Windows (part of MinGW) + elif [[ "$OSTYPE" == "win32" ]]; then + # I'm not sure this can happen. + elif [[ "$OSTYPE" == "freebsd"* ]]; then + # ... + else + # Unknown. + fi + echo $time_millis; +} + + +# command execute after +# REF: http://zsh.sourceforge.net/Doc/Release/Functions.html +precmd() { + # last_cmd + local last_cmd_return_code=$?; + local last_cmd_result=true; + if [ "$last_cmd_return_code" = "0" ]; + then + last_cmd_result=true; + else + last_cmd_result=false; + fi + + # update_git_status + update_git_status; + + # update_command_status + update_command_status $last_cmd_result; + + # output command execute after + output_command_execute_after $last_cmd_result; + +} + + +# set option +setopt PROMPT_SUBST; + + +# timer +#REF: https://stackoverflow.com/questions/26526175/zsh-menu-completion-causes-problems-after-zle-reset-prompt +TMOUT=1; +TRAPALRM() { + # $(git_prompt_info) cost too much time which will raise stutters when inputting. so we need to disable it in this occurence. + # if [ "$WIDGET" != "expand-or-complete" ] && [ "$WIDGET" != "self-insert" ] && [ "$WIDGET" != "backward-delete-char" ]; then + # black list will not enum it completely. even some pipe broken will appear. + # so we just put a white list here. + if [ "$WIDGET" = "" ] || [ "$WIDGET" = "accept-line" ] ; then + zle reset-prompt; + fi +} + + + +# prompt +# PROMPT='$(real_time) $(login_info) $(directory) $(git_status)$(command_status) '; +# PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; +PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; +RPROMPT='%{$FG[242]%}%n@%m${color_reset}'; From 56f0165d0570f2b41890b575dbca3df60234b34d Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Sun, 31 Jan 2021 15:48:56 +0800 Subject: [PATCH 02/10] add battery --- dash-passion.zsh-theme | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index cb8727d..897f3e6 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -222,9 +222,8 @@ TRAPALRM() { } - # prompt # PROMPT='$(real_time) $(login_info) $(directory) $(git_status)$(command_status) '; # PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; -RPROMPT='%{$FG[242]%}%n@%m${color_reset}'; +RPROMPT='%{$FG[242]%}%n@%m $(battery_pct_prompt)${color_reset}'; From 6f765d4c851e53b3262af913c9d17f2e3613e7a3 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Sun, 31 Jan 2021 17:19:03 +0800 Subject: [PATCH 03/10] update --- dash-passion.zsh-theme | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index 897f3e6..5457d2d 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -50,7 +50,8 @@ function login_info() { # directory function directory() { - local color="%{$fg_no_bold[cyan]%}"; + # local color="%{$fg_no_bold[cyan]%}"; + local color="$FG[111]"; # REF: https://stackoverflow.com/questions/25944006/bash-current-working-directory-with-replacing-path-to-home-folder local directory="${PWD/#$HOME/~}"; local color_reset="%{$reset_color%}"; @@ -61,8 +62,9 @@ function directory() { # git ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[blue]%}git(%{$fg_no_bold[red]%}"; ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "; -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) 🔥"; -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[blue]%})"; +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) %{$fg_no_bold[red]%}⇡⇣";#⬣⎔⬢⬣⇵⇅ +# ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) 🔥"; +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[blue]%})";#⬡ function update_git_status() { GIT_STATUS=$(git_prompt_info); @@ -226,4 +228,5 @@ TRAPALRM() { # PROMPT='$(real_time) $(login_info) $(directory) $(git_status)$(command_status) '; # PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; +# RPROMPT='%{$FG[242]%}%n@%m${color_reset}'; RPROMPT='%{$FG[242]%}%n@%m $(battery_pct_prompt)${color_reset}'; From 7225d71f2df49f6903565d518d720273d8fd59e1 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Sun, 31 Jan 2021 17:26:08 +0800 Subject: [PATCH 04/10] add git commit --- dash-passion.zsh-theme | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index 5457d2d..d641636 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -62,9 +62,17 @@ function directory() { # git ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[blue]%}git(%{$fg_no_bold[red]%}"; ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "; -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) %{$fg_no_bold[red]%}⇡⇣";#⬣⎔⬢⬣⇵⇅ +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) %{$fg_no_bold[red]%}⬢";#⬣⎔⬢⬣⇵⇅ # ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) 🔥"; -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[blue]%})";#⬡ +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[blue]%}) %{$fg_no_bold[green]%}⬡";#⬡ + +# ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED=true; +# ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="%{$fg_no_bold[red]%}⇡" +# ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="%{$fg_no_bold[red]%}⇣" +ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX="$FG[005]⇡" +ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX="" +ZSH_THEME_GIT_COMMITS_BEHIND_PREFIX="$FG[005]⇣" +ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX="" function update_git_status() { GIT_STATUS=$(git_prompt_info); @@ -103,7 +111,7 @@ typeset +H my_orange="$FG[214]" # separator dashes size function afmagic_dashes { - local ratio=0.9 + local ratio=1 echo $((COLUMNS * ratio)) } @@ -224,9 +232,10 @@ TRAPALRM() { } + # prompt # PROMPT='$(real_time) $(login_info) $(directory) $(git_status)$(command_status) '; # PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; -PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; +PROMPT='$(real_time) $(directory) $(git_status)$(git_commits_ahead)$(git_commits_behind) $(command_status) '; # RPROMPT='%{$FG[242]%}%n@%m${color_reset}'; RPROMPT='%{$FG[242]%}%n@%m $(battery_pct_prompt)${color_reset}'; From 491f39820ba86c31ae287b855f77edd4332c6b85 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Mon, 27 Sep 2021 11:11:54 +0800 Subject: [PATCH 05/10] add ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..600d2d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode \ No newline at end of file From d7ad045daaceddb7a128b11d4fb0b2d42d9548ec Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Mon, 31 Jan 2022 00:24:43 +0800 Subject: [PATCH 06/10] update --- dash-passion.zsh-theme | 163 ++++++++++++++++++++++++++++++++++------- 1 file changed, 135 insertions(+), 28 deletions(-) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index d641636..e727eed 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -1,4 +1,3 @@ - # gdate for macOS # REF: https://apple.stackexchange.com/questions/135742/time-in-milliseconds-since-epoch-in-the-terminal if [[ "$OSTYPE" == "darwin"* ]]; then @@ -60,25 +59,141 @@ function directory() { # git -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[blue]%}git(%{$fg_no_bold[red]%}"; -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "; -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) %{$fg_no_bold[red]%}⬢";#⬣⎔⬢⬣⇵⇅ -# ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_no_bold[blue]%}) 🔥"; -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[blue]%}) %{$fg_no_bold[green]%}⬡";#⬡ +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[blue]%}❮%{$fg_no_bold[red]%}"; +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"; +ZSH_THEME_GIT_PROMPT_END_SUFFIX="%{$fg_no_bold[blue]%}❯%{$reset_color%}"; + +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}" -# ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED=true; -# ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="%{$fg_no_bold[red]%}⇡" -# ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="%{$fg_no_bold[red]%}⇣" ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX="$FG[005]⇡" -ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX="" +ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_COMMITS_BEHIND_PREFIX="$FG[005]⇣" -ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX="" +ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX="%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}+%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}*%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}⬢%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}!%{$reset_color%}" + + +function __git_branch() { + local ref + ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(command git rev-parse --short HEAD 2> /dev/null) || return + echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref#refs/heads/}${ZSH_THEME_GIT_PROMPT_SUFFIX}" +} + +function vscode_git_status() { + [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return + + # Maps a git status prefix to an internal constant + # This cannot use the prompt constants, as they may be empty + local -A prefix_constant_map + prefix_constant_map=( + '\?\? ' 'UNTRACKED' + '[MTARC][MTD] ' 'STAGEDUNSTAGED' + '[MTARC] ' 'STAGED' + 'D ' 'STAGED' + ' [AMD] ' 'UNSTAGED' + '[DAU][DAU] ' 'UNMERGED' + 'ahead' 'AHEAD' + 'behind' 'BEHIND' + 'diverged' 'DIVERGED' + 'stashed' 'STASHED' + ) + + # Maps the internal constant to the prompt theme + local -A constant_prompt_map + constant_prompt_map=( + 'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED" + 'ADDED' "$ZSH_THEME_GIT_PROMPT_ADDED" + 'MODIFIED' "$ZSH_THEME_GIT_PROMPT_MODIFIED" + 'RENAMED' "$ZSH_THEME_GIT_PROMPT_RENAMED" + 'DELETED' "$ZSH_THEME_GIT_PROMPT_DELETED" + 'UNMERGED' "$ZSH_THEME_GIT_PROMPT_UNMERGED" + 'AHEAD' "$(git_commits_ahead)" + 'BEHIND' "$(git_commits_behind)" + 'DIVERGED' "$ZSH_THEME_GIT_PROMPT_DIVERGED" + 'STASHED' "$ZSH_THEME_GIT_PROMPT_STASHED" + 'STAGED' "$ZSH_THEME_GIT_PROMPT_STAGED" + 'UNSTAGED' "$ZSH_THEME_GIT_PROMPT_UNSTAGED" + 'STAGEDUNSTAGED' "${ZSH_THEME_GIT_PROMPT_UNSTAGED}${ZSH_THEME_GIT_PROMPT_STAGED}" + ) + + # The order that the prompt displays should be added to the prompt + local status_constants + status_constants=( + UNTRACKED ADDED MODIFIED RENAMED DELETED + STASHED UNMERGED AHEAD BEHIND DIVERGED STAGED UNSTAGED STAGEDUNSTAGED + ) + + local status_text + status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)" + + # Don't continue on a catastrophic failure + if [[ $? -eq 128 ]]; then + return 1 + fi + + # A lookup table of each git status encountered + local -A statuses_seen + + if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then + statuses_seen[STASHED]=1 + fi + + local status_lines + status_lines=("${(@f)${status_text}}") + + # If the tracking line exists, get and parse it + if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then + local branch_statuses + branch_statuses=("${(@s/,/)match}") + for branch_status in $branch_statuses; do + if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then + continue + fi + local last_parsed_status=$prefix_constant_map[$match[1]] + statuses_seen[$last_parsed_status]=$match[2] + done + fi + + # For each status prefix, do a regex comparison + for status_prefix in ${(k)prefix_constant_map}; do + local status_constant="${prefix_constant_map[$status_prefix]}" + local status_regex=$'(^|\n)'"$status_prefix" + + if [[ "$status_text" =~ $status_regex ]]; then + statuses_seen[$status_constant]=1 + fi + done + + # Display the seen statuses in the order specified + local status_prompt + for status_constant in $status_constants; do + if (( ${+statuses_seen[$status_constant]} )); then + local next_display=$constant_prompt_map[$status_constant] + status_prompt="$next_display$status_prompt" + fi + done + + echo $status_prompt +} function update_git_status() { - GIT_STATUS=$(git_prompt_info); + if __git_prompt_git rev-parse --git-dir &>/dev/null; then + GIT_STATUS=$(__git_branch); + local git_status="$(vscode_git_status)" + if [[ $git_status != "" ]]; then + GIT_STATUS+=" ${git_status}"; + fi + GIT_STATUS+=${ZSH_THEME_GIT_PROMPT_END_SUFFIX}; + fi } function git_status() { + update_git_status; echo "${GIT_STATUS}" } @@ -191,7 +306,7 @@ current_time_millis() { # command execute after # REF: http://zsh.sourceforge.net/Doc/Release/Functions.html -precmd() { +dash_passion_precmd() { # last_cmd local last_cmd_return_code=$?; local last_cmd_result=true; @@ -203,7 +318,7 @@ precmd() { fi # update_git_status - update_git_status; + update_git_status # update_command_status update_command_status $last_cmd_result; @@ -213,14 +328,8 @@ precmd() { } - -# set option -setopt PROMPT_SUBST; - - -# timer -#REF: https://stackoverflow.com/questions/26526175/zsh-menu-completion-causes-problems-after-zle-reset-prompt TMOUT=1; + TRAPALRM() { # $(git_prompt_info) cost too much time which will raise stutters when inputting. so we need to disable it in this occurence. # if [ "$WIDGET" != "expand-or-complete" ] && [ "$WIDGET" != "self-insert" ] && [ "$WIDGET" != "backward-delete-char" ]; then @@ -231,11 +340,9 @@ TRAPALRM() { fi } - - -# prompt -# PROMPT='$(real_time) $(login_info) $(directory) $(git_status)$(command_status) '; -# PROMPT='$(real_time) $(directory) $(git_status)$(command_status) '; -PROMPT='$(real_time) $(directory) $(git_status)$(git_commits_ahead)$(git_commits_behind) $(command_status) '; -# RPROMPT='%{$FG[242]%}%n@%m${color_reset}'; +setopt prompt_subst +PROMPT='$(real_time) $(directory) $(git_status) $(command_status) '; RPROMPT='%{$FG[242]%}%n@%m $(battery_pct_prompt)${color_reset}'; + +autoload -Uz add-zsh-hook +add-zsh-hook precmd dash_passion_precmd \ No newline at end of file From 7e967fb1249d4c880ad8134a57b642310e205c6d Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Mon, 31 Jan 2022 16:12:04 +0800 Subject: [PATCH 07/10] fix git branch appear cache --- dash-passion.zsh-theme | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index e727eed..87ba6de 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -189,7 +189,9 @@ function update_git_status() { GIT_STATUS+=" ${git_status}"; fi GIT_STATUS+=${ZSH_THEME_GIT_PROMPT_END_SUFFIX}; - fi + else + GIT_STATUS="" + fi } function git_status() { From b76583ce01cd0a3f34dcae4c65be3c89f176a445 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Mon, 31 Jan 2022 21:29:02 +0800 Subject: [PATCH 08/10] fix git bugs --- dash-passion.zsh-theme | 62 ++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index 87ba6de..91e8f26 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -91,41 +91,55 @@ function vscode_git_status() { # This cannot use the prompt constants, as they may be empty local -A prefix_constant_map prefix_constant_map=( - '\?\? ' 'UNTRACKED' - '[MTARC][MTD] ' 'STAGEDUNSTAGED' - '[MTARC] ' 'STAGED' - 'D ' 'STAGED' - ' [AMD] ' 'UNSTAGED' - '[DAU][DAU] ' 'UNMERGED' - 'ahead' 'AHEAD' - 'behind' 'BEHIND' - 'diverged' 'DIVERGED' - 'stashed' 'STASHED' + '\?\? ' 'UNTRACKED' + '[MTARC][ MTD] ' 'STAGED' + 'D ' 'STAGED' + ' [AMTD] ' 'UNSTAGED' + '[MTARC][MTD] ' 'UNSTAGED' + '[DAU][DAU] ' 'UNMERGED' + 'ahead' 'AHEAD' + 'behind' 'BEHIND' + 'diverged' 'DIVERGED' + 'stashed' 'STASHED' ) + # '(?![DAU][DAU])[MTARCD][AMTD ] ' 'STAGED' # exclude the `[DAU][DAU]` + # '(?![DAU][DAU])[MTARCD ][AMTD] ' 'UNSTAGED' +# prefix_constant_map=( +# '\?\? ' 'UNTRACKED' +# '[MTARC][MTD] ' 'STAGEDUNSTAGED' +# '[MTARC] ' 'STAGED' +# 'D ' 'STAGED' +# ' [AMD] ' 'UNSTAGED' +# '[DAU][DAU] ' 'UNMERGED' +# 'ahead' 'AHEAD' +# 'behind' 'BEHIND' +# 'diverged' 'DIVERGED' +# 'stashed' 'STASHED' +# ) + # Maps the internal constant to the prompt theme local -A constant_prompt_map constant_prompt_map=( - 'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED" - 'ADDED' "$ZSH_THEME_GIT_PROMPT_ADDED" - 'MODIFIED' "$ZSH_THEME_GIT_PROMPT_MODIFIED" - 'RENAMED' "$ZSH_THEME_GIT_PROMPT_RENAMED" - 'DELETED' "$ZSH_THEME_GIT_PROMPT_DELETED" - 'UNMERGED' "$ZSH_THEME_GIT_PROMPT_UNMERGED" - 'AHEAD' "$(git_commits_ahead)" - 'BEHIND' "$(git_commits_behind)" - 'DIVERGED' "$ZSH_THEME_GIT_PROMPT_DIVERGED" - 'STASHED' "$ZSH_THEME_GIT_PROMPT_STASHED" - 'STAGED' "$ZSH_THEME_GIT_PROMPT_STAGED" - 'UNSTAGED' "$ZSH_THEME_GIT_PROMPT_UNSTAGED" - 'STAGEDUNSTAGED' "${ZSH_THEME_GIT_PROMPT_UNSTAGED}${ZSH_THEME_GIT_PROMPT_STAGED}" + 'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED" + 'ADDED' "$ZSH_THEME_GIT_PROMPT_ADDED" + 'MODIFIED' "$ZSH_THEME_GIT_PROMPT_MODIFIED" + 'RENAMED' "$ZSH_THEME_GIT_PROMPT_RENAMED" + 'DELETED' "$ZSH_THEME_GIT_PROMPT_DELETED" + 'UNMERGED' "$ZSH_THEME_GIT_PROMPT_UNMERGED" + 'AHEAD' "$(git_commits_ahead)" + 'BEHIND' "$(git_commits_behind)" + 'DIVERGED' "$ZSH_THEME_GIT_PROMPT_DIVERGED" + 'STASHED' "$ZSH_THEME_GIT_PROMPT_STASHED" + 'STAGED' "$ZSH_THEME_GIT_PROMPT_STAGED" + 'UNSTAGED' "$ZSH_THEME_GIT_PROMPT_UNSTAGED" ) # The order that the prompt displays should be added to the prompt local status_constants status_constants=( UNTRACKED ADDED MODIFIED RENAMED DELETED - STASHED UNMERGED AHEAD BEHIND DIVERGED STAGED UNSTAGED STAGEDUNSTAGED + STASHED UNMERGED AHEAD BEHIND DIVERGED STAGED UNSTAGED ) local status_text From 51f054b3d376e79ebc3c6940e0d16e2dc6ab0399 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Thu, 10 Feb 2022 15:26:40 +0800 Subject: [PATCH 09/10] local `status_prefix` --- dash-passion.zsh-theme | 1 + 1 file changed, 1 insertion(+) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index 91e8f26..d32e8fa 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -173,6 +173,7 @@ function vscode_git_status() { done fi + local status_prefix # For each status prefix, do a regex comparison for status_prefix in ${(k)prefix_constant_map}; do local status_constant="${prefix_constant_map[$status_prefix]}" From 4c7cb8e45584dafc5730da25806e3e4a1328b2c0 Mon Sep 17 00:00:00 2001 From: Alwaysproblem Date: Fri, 11 Mar 2022 13:56:15 +0800 Subject: [PATCH 10/10] add local vars --- dash-passion.zsh-theme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dash-passion.zsh-theme b/dash-passion.zsh-theme index d32e8fa..d41c0c9 100644 --- a/dash-passion.zsh-theme +++ b/dash-passion.zsh-theme @@ -163,6 +163,8 @@ function vscode_git_status() { # If the tracking line exists, get and parse it if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then local branch_statuses + local match + local branch_status branch_statuses=("${(@s/,/)match}") for branch_status in $branch_statuses; do if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then