From 3a94826ed198ba9a569c77d163202707cda42530 Mon Sep 17 00:00:00 2001 From: LeMarsu Date: Mon, 15 Jan 2018 08:58:05 +0100 Subject: fix: Remove dependency of bc for load widget --- powerlevel9k.zsh-theme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 97e99f43..14d7bd81 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -983,9 +983,9 @@ prompt_load() { # Replace comma load_avg=${load_avg//,/.} - if [[ "$load_avg" -gt $(bc -l <<< "${cores} * 0.7") ]]; then + if [[ "$load_avg" -gt $((${cores} * 0.7)) ]]; then current_state="critical" - elif [[ "$load_avg" -gt $(bc -l <<< "${cores} * 0.5") ]]; then + elif [[ "$load_avg" -gt $((${cores} * 0.5)) ]]; then current_state="warning" else current_state="normal" -- cgit v1.2.3 From 04850df7504326e06588bbbde4213137c9360e88 Mon Sep 17 00:00:00 2001 From: Daniel Tam Date: Sat, 3 Feb 2018 20:14:52 +1100 Subject: Add absolute truncation option to dir segment --- powerlevel9k.zsh-theme | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index c32ccd48..4224075e 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -728,6 +728,13 @@ prompt_dir() { set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026' case "$POWERLEVEL9K_SHORTEN_STRATEGY" in + truncate_absolute_chars) + if [ ${#current_path} -gt $(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH + ${#POWERLEVEL9K_SHORTEN_DELIMITER} )) ]; then + current_path=$(echo $current_path | rev | cut -c 1-$POWERLEVEL9K_SHORTEN_DIR_LENGTH | rev | cat <(echo -n $POWERLEVEL9K_SHORTEN_DELIMITER) -) + fi + # Alternative implementation + #current_path="%$POWERLEVEL9K_SHORTEN_DIR_LENGTH<$POWERLEVEL9K_SHORTEN_DELIMITER<%~%<<" + ;; truncate_middle) current_path=$(echo "$current_path" | sed $SED_EXTENDED_REGEX_PARAMETER "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1$POWERLEVEL9K_SHORTEN_DELIMITER\2\//g") ;; -- cgit v1.2.3 From c69d21016caa712481f3738a62ba2722d5583047 Mon Sep 17 00:00:00 2001 From: Matthew Hoener Date: Wed, 7 Feb 2018 14:56:48 -0800 Subject: Fix vi mode plugin --- powerlevel9k.zsh-theme | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 14d7bd81..15a0b68a 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1522,6 +1522,11 @@ NEWLINE=' [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]] && PROMPT="$NEWLINE$PROMPT" } +zle-keymap-select () { + zle reset-prompt + zle -R +} + prompt_powerlevel9k_setup() { # The value below was set to better support 32-bit CPUs. # It's the maximum _signed_ integer value on 32-bit CPUs. @@ -1590,6 +1595,8 @@ prompt_powerlevel9k_setup() { # prepare prompts add-zsh-hook precmd powerlevel9k_prepare_prompts add-zsh-hook preexec powerlevel9k_preexec + + zle -N zle-keymap-select } prompt_powerlevel9k_teardown() { -- cgit v1.2.3 From 162caba19cdc51ea52eb5fabd5d18f03cb20e467 Mon Sep 17 00:00:00 2001 From: Matthew Hoener Date: Wed, 7 Feb 2018 15:15:02 -0800 Subject: Don't show segment if POWERLEVEL9K_VI_INSERT_MODE_STRING == '' --- README.md | 2 ++ powerlevel9k.zsh-theme | 1 + 2 files changed, 3 insertions(+) (limited to 'powerlevel9k.zsh-theme') diff --git a/README.md b/README.md index 46d8ab61..fdb2f5d7 100644 --- a/README.md +++ b/README.md @@ -621,6 +621,8 @@ you are using the [ZSH Line Editor](http://zsh.sourceforge.net/Doc/Release/Zsh-L |`POWERLEVEL9K_VI_INSERT_MODE_STRING`|`"INSERT"`|String to display while in 'Insert' mode.| |`POWERLEVEL9K_VI_COMMAND_MODE_STRING`|`"NORMAL"`|String to display while in 'Command' mode.| +To hide the segment entirely when in `INSERT` mode, set `POWERLEVEL9K_VI_INSERT_MODE_STRING=''` + #### Unit Test Ratios The `symfony2_tests` and `rspec_stats` segments both show a ratio of "real" diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 15a0b68a..6e30efee 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1366,6 +1366,7 @@ prompt_vi_mode() { "$1_prompt_segment" "$0_NORMAL" "$2" "$DEFAULT_COLOR" "default" "$POWERLEVEL9K_VI_COMMAND_MODE_STRING" ;; main|viins|*) + if [[ -z $POWERLEVEL9K_VI_INSERT_MODE_STRING ]]; then return; fi "$1_prompt_segment" "$0_INSERT" "$2" "$DEFAULT_COLOR" "blue" "$POWERLEVEL9K_VI_INSERT_MODE_STRING" ;; esac -- cgit v1.2.3 From d841e1d0d0bbc1260a12930d79402b93c57c828d Mon Sep 17 00:00:00 2001 From: Christo Kotze Date: Sat, 10 Feb 2018 13:29:04 +0400 Subject: Fix iTerm2 integration with PowerLevel9k This fix allows the user to see the "little blue triangle" that is created when iTerm2 shell integration is enabled. --- powerlevel9k.zsh-theme | 3 +++ 1 file changed, 3 insertions(+) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index c32ccd48..c044c6b5 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1623,6 +1623,9 @@ $(print_icon 'MULTILINE_LAST_PROMPT_PREFIX')' NEWLINE=' ' [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]] && PROMPT="$NEWLINE$PROMPT" + + # Allow iTerm integration to work + [[ $ITERM_SHELL_INTEGRATION_INSTALLED == "Yes" ]] && PROMPT="%{$(iterm2_prompt_mark)%}$PROMPT" } set_default POWERLEVEL9K_IGNORE_TERM_COLORS false -- cgit v1.2.3 From 7b8656f8e79fb369b91b93cb3cbbe437935bb893 Mon Sep 17 00:00:00 2001 From: Michael Louwrens Date: Sat, 10 Feb 2018 19:46:31 +0200 Subject: add sudo status to context and user prompts --- powerlevel9k.zsh-theme | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index c32ccd48..40b38a22 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -590,6 +590,7 @@ prompt_context() { typeset -AH context_states context_states=( "ROOT" "yellow" + "SUDO" "yellow" "DEFAULT" "yellow" "REMOTE" "yellow" ) @@ -608,6 +609,8 @@ prompt_context() { current_state="ROOT" elif [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then current_state="REMOTE" + elif sudo -n uptime >/dev/null 2>&1; then + current_statue="SUDO" fi "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}" @@ -629,6 +632,14 @@ prompt_user() { "FOREGROUND_COLOR" "yellow" "VISUAL_IDENTIFIER" "ROOT_ICON" ) + elif sudo -n uptime >/dev/null 2>&1; then + user_state=( + "STATE" "SUDO" + "CONTENT" "${POWERLEVEL9K_USER_TEMPLATE}" + "BACKGROUND_COLOR" "${DEFAULT_COLOR}" + "FOREGROUND_COLOR" "yellow" + "VISUAL_IDENTIFIER" "ROOT_ICON" + ) else user_state=( "STATE" "DEFAULT" -- cgit v1.2.3 From 06802647a1919c8f51bbead78104a6093e137e5a Mon Sep 17 00:00:00 2001 From: Michael Louwrens Date: Sat, 10 Feb 2018 20:50:59 +0200 Subject: change sudo detection method --- powerlevel9k.zsh-theme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 40b38a22..17af7ccb 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -609,7 +609,7 @@ prompt_context() { current_state="ROOT" elif [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then current_state="REMOTE" - elif sudo -n uptime >/dev/null 2>&1; then + elif sudo -n true 2>/dev/null; then current_statue="SUDO" fi @@ -632,7 +632,7 @@ prompt_user() { "FOREGROUND_COLOR" "yellow" "VISUAL_IDENTIFIER" "ROOT_ICON" ) - elif sudo -n uptime >/dev/null 2>&1; then + elif sudo -n true 2>/dev/null; then user_state=( "STATE" "SUDO" "CONTENT" "${POWERLEVEL9K_USER_TEMPLATE}" -- cgit v1.2.3 From 0551854a9e09eb6b058710bb9af21327dfb13d54 Mon Sep 17 00:00:00 2001 From: Michael Louwrens Date: Sat, 10 Feb 2018 21:01:09 +0200 Subject: fix typo --- powerlevel9k.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 17af7ccb..bce893fe 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -610,7 +610,7 @@ prompt_context() { elif [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then current_state="REMOTE" elif sudo -n true 2>/dev/null; then - current_statue="SUDO" + current_state="SUDO" fi "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}" -- cgit v1.2.3 From 38937858736ff8a7483dbdd353c36aa190028aab Mon Sep 17 00:00:00 2001 From: Michael Louwrens Date: Sat, 10 Feb 2018 21:24:06 +0200 Subject: try out sudo icon changes --- functions/icons.zsh | 2 ++ powerlevel9k.zsh-theme | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/functions/icons.zsh b/functions/icons.zsh index e642da00..b29d0108 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -258,6 +258,7 @@ case $POWERLEVEL9K_MODE in RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' #  CARRIAGE_RETURN_ICON $'\u21B5' # ↵ ROOT_ICON $'\uE614 ' #  + SUDO_ICON $'\uE0A2' #  RUBY_ICON $'\uF219 ' #  AWS_ICON $'\uF270' #  AWS_EB_ICON $'\UF1BD ' #  @@ -332,6 +333,7 @@ case $POWERLEVEL9K_MODE in RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' #  CARRIAGE_RETURN_ICON $'\u21B5' # ↵ ROOT_ICON $'\u26A1' # ⚡ + SUDO_ICON $'\uE0A2' #  RUBY_ICON '' AWS_ICON 'AWS:' AWS_EB_ICON $'\U1F331 ' # 🌱 diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index bce893fe..2267ce64 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -638,7 +638,7 @@ prompt_user() { "CONTENT" "${POWERLEVEL9K_USER_TEMPLATE}" "BACKGROUND_COLOR" "${DEFAULT_COLOR}" "FOREGROUND_COLOR" "yellow" - "VISUAL_IDENTIFIER" "ROOT_ICON" + "VISUAL_IDENTIFIER" "SUDO_ICON" ) else user_state=( -- cgit v1.2.3 From 7fff5bd7a6c7c6d38c5984a1fa30571e89d14d1e Mon Sep 17 00:00:00 2001 From: Michael Louwrens Date: Mon, 12 Feb 2018 11:28:00 +0200 Subject: add new icons and add remote_sudo --- functions/icons.zsh | 5 ++++- powerlevel9k.zsh-theme | 15 ++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/functions/icons.zsh b/functions/icons.zsh index b29d0108..6000e108 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -27,6 +27,7 @@ case $POWERLEVEL9K_MODE in RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' #  CARRIAGE_RETURN_ICON $'\u21B5' # ↵ ROOT_ICON $'\uE801' #  + SUDO_ICON $'\uF09C' #  RUBY_ICON $'\uE847 ' #  AWS_ICON $'\uE895' #  AWS_EB_ICON $'\U1F331 ' # 🌱 @@ -105,6 +106,7 @@ case $POWERLEVEL9K_MODE in RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' #  CARRIAGE_RETURN_ICON $'\u21B5' # ↵ ROOT_ICON $'\uF201' #  + SUDO_ICON $'\uF09C' #  RUBY_ICON $'\uF219 ' #  AWS_ICON $'\uF270' #  AWS_EB_ICON $'\U1F331 ' # 🌱 @@ -188,6 +190,7 @@ case $POWERLEVEL9K_MODE in RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' #  CARRIAGE_RETURN_ICON $'\u21B5' # ↵ ROOT_ICON '\u'$CODEPOINT_OF_OCTICONS_ZAP #  + SUDO_ICON '\u'$CODEPOINT_OF_AWESOME_UNLOCK #  RUBY_ICON '\u'$CODEPOINT_OF_OCTICONS_RUBY' ' #  AWS_ICON '\u'$CODEPOINT_OF_AWESOME_SERVER #  AWS_EB_ICON $'\U1F331 ' # 🌱 @@ -258,7 +261,7 @@ case $POWERLEVEL9K_MODE in RIGHT_SUBSEGMENT_SEPARATOR $'\uE0B3' #  CARRIAGE_RETURN_ICON $'\u21B5' # ↵ ROOT_ICON $'\uE614 ' #  - SUDO_ICON $'\uE0A2' #  + SUDO_ICON $'\uF09C' #  RUBY_ICON $'\uF219 ' #  AWS_ICON $'\uF270' #  AWS_EB_ICON $'\UF1BD ' #  diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 2267ce64..8eb13bde 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -589,10 +589,11 @@ prompt_context() { local current_state="DEFAULT" typeset -AH context_states context_states=( - "ROOT" "yellow" - "SUDO" "yellow" - "DEFAULT" "yellow" - "REMOTE" "yellow" + "ROOT" "yellow" + "SUDO" "yellow" + "DEFAULT" "yellow" + "REMOTE" "yellow" + "REMOTE_SUDO" "yellow" ) local content="" @@ -608,7 +609,11 @@ prompt_context() { if [[ $(print -P "%#") == '#' ]]; then current_state="ROOT" elif [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then - current_state="REMOTE" + if sudo -n true 2>/dev/null; then + current_state="REMOTE_SUDO" + else + current_state="REMOTE" + fi elif sudo -n true 2>/dev/null; then current_state="SUDO" fi -- cgit v1.2.3 From eb1c6ec1fc6ac9310b815296dd791fe798ec74a8 Mon Sep 17 00:00:00 2001 From: Daniel Tam Date: Tue, 13 Feb 2018 22:18:26 +1100 Subject: Refactor absolute char truncation --- powerlevel9k.zsh-theme | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 4224075e..d66787c1 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -730,10 +730,8 @@ prompt_dir() { case "$POWERLEVEL9K_SHORTEN_STRATEGY" in truncate_absolute_chars) if [ ${#current_path} -gt $(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH + ${#POWERLEVEL9K_SHORTEN_DELIMITER} )) ]; then - current_path=$(echo $current_path | rev | cut -c 1-$POWERLEVEL9K_SHORTEN_DIR_LENGTH | rev | cat <(echo -n $POWERLEVEL9K_SHORTEN_DELIMITER) -) + current_path=$POWERLEVEL9K_SHORTEN_DELIMITER${current_path:(-POWERLEVEL9K_SHORTEN_DIR_LENGTH)} fi - # Alternative implementation - #current_path="%$POWERLEVEL9K_SHORTEN_DIR_LENGTH<$POWERLEVEL9K_SHORTEN_DELIMITER<%~%<<" ;; truncate_middle) current_path=$(echo "$current_path" | sed $SED_EXTENDED_REGEX_PARAMETER "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1$POWERLEVEL9K_SHORTEN_DELIMITER\2\//g") -- cgit v1.2.3