diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2023-06-11 10:07:41 +0300 |
|---|---|---|
| committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2023-06-11 10:07:41 +0300 |
| commit | cc4878aef2bdefbac98fa135fca6070d27e4f041 (patch) | |
| tree | 8089d71645e2c526527547cda0ab2947d5732ac6 /internal | |
| parent | c775a3ffd5c68b3aebbe78a27711cb395782bd88 (diff) | |
fix chezmoi segment and rename it to chezmoi_shell (#2311)
- Link to the project's homepage rather than its source code.
- Move `chezmoi_shell` next to all the other *shell indicator* segments.
- Use a shade of blue that resembes the color on chezmoi.io.
- Don't go beyond 8 colors in 8-color configs.
- Remove the segment from the *pure* config.
- Fix whitespace padding on `CHEZMOI_ICON`.
- Use the appropriate icon with all fonts (the same as `HOME`).
- Add missing `CHEZMOI_ICON` definitions for "powerline" and "ascii" font modes.
- Remove the redundant literal "chezmoi" content from the segment.
- Fix instant prompt so that the segment is shown only when `$CHEZMOI` is non-empty.
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/icons.zsh | 12 | ||||
| -rw-r--r-- | internal/p10k.zsh | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/internal/icons.zsh b/internal/icons.zsh index b5f1d0ec..4fce1ee0 100644 --- a/internal/icons.zsh +++ b/internal/icons.zsh @@ -107,7 +107,7 @@ function _p9k_init_icons() { VCS_SVN_ICON 'svn'$q RUST_ICON 'R' PYTHON_ICON '\uE63C'$s # (doesn't always work) - CHEZMOI_ICON '\uf015' # + CHEZMOI_ICON '\uE12C'$s # SWIFT_ICON 'Swift' GO_ICON 'Go' GOLANG_ICON 'Go' @@ -244,7 +244,7 @@ function _p9k_init_icons() { VCS_SVN_ICON 'svn'$q RUST_ICON '\uE6A8' # PYTHON_ICON '\uE63C'$s # - CHEZMOI_ICON '\uf015' # + CHEZMOI_ICON '\uF015'$s # SWIFT_ICON 'Swift' GO_ICON 'Go' GOLANG_ICON 'Go' @@ -386,7 +386,7 @@ function _p9k_init_icons() { VCS_SVN_ICON 'svn'$q RUST_ICON '\uE6A8' # PYTHON_ICON '\U1F40D' # 🐍 - CHEZMOI_ICON "${CODEPOINT_OF_AWESOME_HOME:+\\u$CODEPOINT_OF_AWESOME_HOME}" + CHEZMOI_ICON "${CODEPOINT_OF_AWESOME_HOME:+\\u$CODEPOINT_OF_AWESOME_HOME$s}" SWIFT_ICON '\uE655'$s # PUBLIC_IP_ICON "${CODEPOINT_OF_AWESOME_GLOBE:+\\u$CODEPOINT_OF_AWESOME_GLOBE$s}" LOCK_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}" @@ -522,7 +522,7 @@ function _p9k_init_icons() { VCS_SVN_ICON '\uE72D'$q # RUST_ICON '\uE7A8'$q # PYTHON_ICON '\UE73C ' # - CHEZMOI_ICON '\Uf015' # + CHEZMOI_ICON '\uF015'$s # SWIFT_ICON '\uE755' # GO_ICON '\uE626' # GOLANG_ICON '\uE626' # @@ -660,7 +660,7 @@ function _p9k_init_icons() { VCS_SVN_ICON '\uE72D'$q # RUST_ICON '\uE7A8'$q # PYTHON_ICON '\UE73C ' # - CHEZMOI_ICON '\Uf015' # + CHEZMOI_ICON '\uF015'$s # SWIFT_ICON '\uE755' # GO_ICON '\uE626' # GOLANG_ICON '\uE626' # @@ -795,6 +795,7 @@ function _p9k_init_icons() { VCS_SVN_ICON '' RUST_ICON 'rust' PYTHON_ICON 'py' + CHEZMOI_ICON 'chezmoi' SWIFT_ICON 'swift' GO_ICON 'go' GOLANG_ICON 'go' @@ -931,6 +932,7 @@ function _p9k_init_icons() { VCS_SVN_ICON '' RUST_ICON 'R' PYTHON_ICON 'Py' + CHEZMOI_ICON 'Chez' SWIFT_ICON 'Swift' GO_ICON 'Go' GOLANG_ICON 'Go' diff --git a/internal/p10k.zsh b/internal/p10k.zsh index b41c6ebb..ca735e50 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -4260,19 +4260,17 @@ instant_prompt_vi_mode() { fi } -################################################################ -# Segment to display chezmoi information. -# More information: https://www.chezmoi.io/ -prompt_chezmoi() { - _p9k_prompt_segment "$0" "black" "white" 'CHEZMOI_ICON' 0 '' "chezmoi" +# Chezmoi shell indicator: https://www.chezmoi.io/ +prompt_chezmoi_shell() { + _p9k_prompt_segment $0 blue $_p9k_color1 CHEZMOI_ICON 0 '' '' } -_p9k_prompt_chezmoi_init() { +_p9k_prompt_chezmoi_shell_init() { typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$CHEZMOI' } -function instant_prompt_chezmoi() { - _p9k_prompt_segment prompt_chezmoi "black" "white" CHEZMOI_ICON 0 '' 'chezmoi' +function instant_prompt_chezmoi_shell() { + _p9k_prompt_segment prompt_chezmoi_shell blue $_p9k_color1 CHEZMOI_ICON 1 '$CHEZMOI_ICON' '' } ################################################################ |