diff options
| author | Josh Rahm <rahm@google.com> | 2021-11-15 10:31:24 -0700 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2021-11-15 10:31:24 -0700 |
| commit | a6213bc74c817360d4947fa9d94d97431d5b258c (patch) | |
| tree | 349df3c400c7992c28a448f397f0174f38116f77 | |
| parent | eef56cd6f76244cb7ab54a45ac1c60aa3e658f12 (diff) | |
| download | zshrcd-a6213bc74c817360d4947fa9d94d97431d5b258c.tar.gz zshrcd-a6213bc74c817360d4947fa9d94d97431d5b258c.tar.bz2 zshrcd-a6213bc74c817360d4947fa9d94d97431d5b258c.zip | |
Change rahm1 prompt to use the simple_prompt
| -rw-r--r-- | 00-prompt.zsh | 4 | ||||
| -rw-r--r-- | prompts/rahm1.zsh | 50 |
2 files changed, 5 insertions, 49 deletions
diff --git a/00-prompt.zsh b/00-prompt.zsh index b27691f..cfeba64 100644 --- a/00-prompt.zsh +++ b/00-prompt.zsh @@ -20,6 +20,8 @@ function distro_logo { esac } +DISTRO_LOGO=$(distro_logo) + function simple_prompt { ec=$? preamble="" @@ -35,7 +37,7 @@ function simple_prompt { host="${1}%m${default}" directory="${2}%2~${default}" - echo " ${default}$(distro_logo) ${code} ${name}${host} ${directory} ยท %{\x1b[00m%}" + echo " ${default}${DISTRO_LOGO} ${code} ${name}${host} ${directory} ยท %{\x1b[00m%}" } function simple_rprompt { diff --git a/prompts/rahm1.zsh b/prompts/rahm1.zsh index bb0b86f..f4eab3a 100644 --- a/prompts/rahm1.zsh +++ b/prompts/rahm1.zsh @@ -1,51 +1,5 @@ -grey='\e[0;90m' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}[" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="]%{$fg[red]%}โฒ%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="] " - -GREEN="%{\x1b[01;32m%}" -PURPLE="%{\x1b[01;35m%}" ORANGE="%{\x1b[01;38;5;208m%}" GRAY="%{\x1b[01;38;5;239m%}" -RED="%{\x1b[01;31m%}" -RESET="%{\x1b[00m%}" - -terminal_color_1="${ORANGE}" -terminal_color_2="${GRAY}" -terminal_color_3="${ORANGE}" -terminal_color_4="${GRAY}" -terminal_color_5="${GRAY}" -terminal_color_6="${GRAY}" -terminal_color_7="${GRAY}" - -function rahm_prompt { - ec=$? - preamble="" - - default="${terminal_color_4}" - if [ "$ec" -eq "0" ] ; then - code="${GREEN}--${default}" - else - code="${RED}$(printf '%02x' $ec)${default}" - fi - - underline='' - name="${terminal_color_1}%n@${default}" - host="${terminal_color_3}%m${default}" - directory="${terminal_color_2}%2~${default}" - - echo "${default}๐โ ${code} ${underline}${name}${host} ${directory} โ %{\x1b[00m%}" -} - -function rahm_rprompt { - default="${terminal_color_4}" - time="${terminal_color_3}%*${default}" - echo "${default}โ ${time} ${RESET}" -} - -setopt prompt_subst -PROMPT='$(rahm_prompt)' -RPROMPT='$(rahm_rprompt)' +PROMPT='$(simple_prompt ${ORANGE} ${GRAY})' +RPROMPT='$(simple_rprompt ${ORANGE} ${GRAY})' |