From 1ac9c771f76a477cfd5c9cd0b6ae29d64bd01514 Mon Sep 17 00:00:00 2001 From: romkatv Date: Fri, 11 Oct 2019 16:53:28 +0200 Subject: [PATCH] cleanup --- config/p10k-classic.zsh | 13 +++----- config/p10k-lean.zsh | 6 ++-- config/p10k-p9k.zsh | 74 ----------------------------------------- 3 files changed, 7 insertions(+), 86 deletions(-) delete mode 100644 config/p10k-p9k.zsh diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh index 7b9ae002..88b8ec88 100644 --- a/config/p10k-classic.zsh +++ b/config/p10k-classic.zsh @@ -25,7 +25,7 @@ unset -m 'POWERLEVEL9K_*' # The list of segments shown on the left. Fill it with the most important segments. - typeset -ga POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( + typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( # =========================[ Line #1 ]========================= # os_icon # os identifier dir # current directory @@ -344,12 +344,11 @@ if (( $1 )); then # Styling for up-to-date Git status. - local meta='%f' # default foreground + local meta='%248F' # grey foreground local clean='%76F' # green foreground local modified='%178F' # yellow foreground local untracked='%39F' # blue foreground local conflicted='%196F' # red foreground - local loading='%244F' # grey foreground else # Styling for incomplete and stale Git status. local meta='%244F' # grey foreground @@ -357,7 +356,6 @@ local modified='%244F' # grey foreground local untracked='%244F' # grey foreground local conflicted='%244F' # grey foreground - local loading='%244F' # grey foreground fi local res @@ -471,7 +469,6 @@ typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='↵' ###################[ command_execution_time: duration of the last command ]################### - # Background color. # Show duration of the last command if takes longer than this many seconds. typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 # Show this many fractional digits. Zero means round to seconds. @@ -534,7 +531,7 @@ # Context color when running with privileges. typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=178 - # Context format when running with privileges: bold user@hostname. + # Context format when running with privileges: %n is username, %m is hostname, %B for bold. typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m' # Don't show context unless running with privileges or in SSH. @@ -767,8 +764,8 @@ # Regular expression for the VPN network interface. Run ifconfig while on VPN to see the # name of the interface. typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(wg|(.*tun))[0-9]*' - # Custom icon. - # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Icon to show when on VPN. + typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}' #########################[ proxy: system-wide http/https/ftp proxy ]########################## # Proxy color. diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh index d350785b..b57a9094 100644 --- a/config/p10k-lean.zsh +++ b/config/p10k-lean.zsh @@ -329,7 +329,6 @@ local modified='%178F' # yellow foreground local untracked='%39F' # blue foreground local conflicted='%196F' # red foreground - local loading='%244F' # grey foreground else # Styling for incomplete and stale Git status. local meta='%244F' # grey foreground @@ -337,7 +336,6 @@ local modified='%244F' # grey foreground local untracked='%244F' # grey foreground local conflicted='%244F' # grey foreground - local loading='%244F' # grey foreground fi local res @@ -746,8 +744,8 @@ # Regular expression for the VPN network interface. Run ifconfig while on VPN to see the # name of the interface. typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(wg|(.*tun))[0-9]*' - # Custom icon. - # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Icon to show when on VPN. + typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}' #########################[ proxy: system-wide http/https/ftp proxy ]########################## # Proxy color. diff --git a/config/p10k-p9k.zsh b/config/p10k-p9k.zsh deleted file mode 100644 index c14be784..00000000 --- a/config/p10k-p9k.zsh +++ /dev/null @@ -1,74 +0,0 @@ -# Config for Powerlevel10k with the default style of Powerlevel9k. - -# Temporarily change options. -'builtin' 'local' '-a' 'p10k_config_opts' -[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' - -() { - emulate -L zsh - - # Unset all configuration options. This allows you to apply configiguration changes without - # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`. - unset -m 'POWERLEVEL9K_*' - - # To disable default icons for all segments, set POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION=''. - # - # To enable default icons for all segments, don't define POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION - # or set it to '${P9K_VISUAL_IDENTIFIER}'. - # - # To remove trailing space from all default icons, set POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION - # to '${P9K_VISUAL_IDENTIFIER% }'. - # - # To enable default icons for one segment (e.g., dir), set - # POWERLEVEL9K_DIR_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}'. - # - # To assign a specific icon to one segment (e.g., dir), set - # POWERLEVEL9K_DIR_VISUAL_IDENTIFIER_EXPANSION='⭐'. - # - # To assign a specific icon to a segment in a given state (e.g., dir in state NOT_WRITABLE), - # set POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='⭐'. - # - # Note: You can use $'\u2B50' instead of '⭐'. It's especially convenient when specifying - # icons that your text editor cannot render. Don't forget to put $ and use single quotes when - # defining icons via Unicode codepoints. - # - # Note: Many default icons cannot be displayed with system fonts. You'll need to install a - # capable font to use them. See POWERLEVEL9K_MODE below. - # typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}' - - # This option makes a difference only when default icons are enabled for all or some prompt - # segments (see POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION above). LOCK_ICON can be printed as - # $'\uE0A2', $'\uE138' or $'\uF023' depending on POWERLEVEL9K_MODE. The correct value of this - # parameter depends on the provider of the font your terminal is using. - # - # Font Provider | POWERLEVEL9K_MODE - # ---------------------------------+------------------- - # Powerline | powerline - # Font Awesome | awesome-fontconfig - # Adobe Source Code Pro | awesome-fontconfig - # Source Code Pro | awesome-fontconfig - # Awesome-Terminal Fonts (regular) | awesome-fontconfig - # Awesome-Terminal Fonts (patched) | awesome-patched - # Nerd Fonts | nerdfont-complete - # Other | compatible - # - # If this looks overwhelming, either stick with a preinstalled system font and set - # POWERLEVEL9K_MODE=compatible, or install the recommended Powerlevel10k font from - # https://github.com/romkatv/powerlevel10k/#recommended-meslo-nerd-font-patched-for-powerlevel10k - # and set POWERLEVEL9K_MODE=nerdfont-complete. - typeset -g POWERLEVEL9K_MODE=nerdfont-complete - - # typeset -g POWERLEVEL9K_PYTHON_ICON= - # typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON= - # typeset -g POWERLEVEL9K_VCS_UNSTAGED_ICON= - # typeset -g POWERLEVEL9K_VCS_STAGED_ICON= - # typeset -g POWERLEVEL9K_VCS_STASH_ICON= - # typeset -g POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON= - # typeset -g POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON= -} - -(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -'builtin' 'unset' 'p10k_config_opts'