From 30076080a734c0bff552293b8b2d4e7c69019c03 Mon Sep 17 00:00:00 2001
From: Christian Rebischke <Chris.Rebischke@posteo.de>
Date: Sun, 11 Dec 2016 04:39:45 +0100
Subject: [PATCH 01/21] added ssh support and POWERLEVEL9K_HIDE_HOST feature

refactorized the sourcecode

added true/false switch
---
 README.md              |  5 +++++
 powerlevel9k.zsh-theme | 20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index dc98b7d8..147aee40 100644
--- a/README.md
+++ b/README.md
@@ -241,6 +241,11 @@ elements (it is by default), and define a `DEFAULT_USER` in your `~/.zshrc`:
 |----------|---------------|-------------|
 |`DEFAULT_USER`|None|Username to consider a "default context" (you can also use `$USER`)|
 
+You can use POWERLEVEL9K_HIDE_HOST for hiding the hostname in the prompt
+when you are not in a ssh session. For example:
+
+    POWERLEVEL9K_HIDE_HOST="yes"
+
 ##### dir
 
 The `dir` segment shows the current working directory. When using the "Awesome
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index c4b24b55..f2262994 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -434,13 +434,25 @@ prompt_battery() {
 # Context: user@hostname (who am I and where am I)
 # Note that if $DEFAULT_USER is not set, this prompt segment will always print
 prompt_context() {
-  if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+  local current_state="DEFAULT"
+  declare -A context_states
+  context_states=(
+    "ROOT"      "yellow"
+    "DEFAULT"   "011"
+  )
+  local content="$USER"
+  if [[ "$USER" != "$DEFAULT_USER" ]]; then
     if [[ $(print -P "%#") == '#' ]]; then
-      # Shell runs as root
-      "$1_prompt_segment" "$0_ROOT" "$2" "$DEFAULT_COLOR" "yellow" "$USER@%m"
+      current_state="ROOT"
+    fi
+    if [[ -z "$SSH_CLIENT" && -z "$SSH_TTY" ]]; then
+      if [[ "$POWERLEVEL9K_HIDE_HOST" == "false" || -z "$POWERLEVEL9K_HIDE_HOST"  ]]; then
+        content="${content}@%m"
+      fi
     else
-      "$1_prompt_segment" "$0_DEFAULT" "$2" "$DEFAULT_COLOR" "011" "$USER@%m"
+      content="${content}@%m"
     fi
+    "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}"
   fi
 }
 

From b379f03f148d99a0da8c8eb200f17b3007a87e47 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Mon, 30 Jan 2017 21:10:09 +0100
Subject: [PATCH 02/21] Add ability to omit the first character in dir path

---
 README.md              | 7 +++++--
 powerlevel9k.zsh-theme | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f7a80a09..04632323 100644
--- a/README.md
+++ b/README.md
@@ -304,9 +304,12 @@ the path shown would be `my-cool-project`.  If you navigate to `$HOME/projects/m
 
 If you want to customize the directory separator, you could set:
 ```zsh
-# You'll need patched awesome-terminal fonts for that example
-POWERLEVEL9K_DIR_PATH_SEPARATOR="%f "$'\uE0B1'" %F"
+# Double quotes are important here!
+POWERLEVEL9K_DIR_PATH_SEPARATOR="%F{red} $(print_icon 'LEFT_SUBSEGMENT_SEPARATOR') %F{black}"
 ```
+To omit the first character (usually a slash that gets replaced if you set `POWERLEVEL9K_DIR_PATH_SEPARATOR`),
+you could set `POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER=true`.
+
 
 ##### disk_usage
 
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index f104b789..3010790e 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -616,6 +616,10 @@ prompt_dir() {
     esac
   fi
 
+  if [[ "${POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER}" == "true" ]]; then
+    current_path="${current_path[2,-1]}"
+  fi
+
   if [[ "${POWERLEVEL9K_DIR_PATH_SEPARATOR}" != "/" ]]; then
     current_path=$(print -P "${current_path}" | sed "s/\//${POWERLEVEL9K_DIR_PATH_SEPARATOR}/g")
   fi

From ebf808c533ed86ede4b5afcf9206c05b832278db Mon Sep 17 00:00:00 2001
From: Benoit Averty <benoit.averty@gmail.com>
Date: Wed, 10 Aug 2016 00:07:04 +0200
Subject: [PATCH 03/21] Add dir_truncate_root option

---
 functions/utilities.zsh | 15 +++++++++++++++
 powerlevel9k.zsh-theme  | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/functions/utilities.zsh b/functions/utilities.zsh
index f27c7f99..8263ce10 100644
--- a/functions/utilities.zsh
+++ b/functions/utilities.zsh
@@ -208,3 +208,18 @@ function truncatePathFromRight() {
   echo $1 | sed $SED_EXTENDED_REGEX_PARAMETER \
  "s@(([^/]{$((POWERLEVEL9K_SHORTEN_DIR_LENGTH))})([^/]{$delim_len}))[^/]+/@\2$POWERLEVEL9K_SHORTEN_DELIMITER/@g"
 }
+
+# Search recursively in parent folders for given file.
+function upsearch () {
+  if test -e "$1"; then
+    echo "$PWD"
+  else
+    if [[ "$PWD" == "/" || "$PWD" == "$HOME" ]]; then
+      echo "$PWD";
+    else
+      pushd .. > /dev/null
+      upsearch "$1"
+      popd > /dev/null
+    fi
+  fi
+}
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index f104b789..c679ba56 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -571,8 +571,7 @@ prompt_custom() {
 set_default POWERLEVEL9K_DIR_PATH_SEPARATOR "/"
 prompt_dir() {
   local current_path='%~'
-  if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" ]]; then
-
+  if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_root_marker" ]]; then
     set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026'
 
     case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
@@ -610,6 +609,20 @@ prompt_dir() {
           current_path=$(truncatePathFromRight "$(pwd | sed -e "s,^$HOME,~,")" )
         fi
       ;;
+      truncate_with_root_marker)
+        local dir_truncate_root
+
+        dir_truncate_root=$(upsearch $POWERLEVEL9K_ROOT_MARKER_FILE)
+        zero='%([BSUbfksu]|([FB]|){*})'
+
+        if [[ "$dir_truncate_root" == "/" || "$dir_truncate_root" == "$HOME" ]]; then
+          current_path='%~'
+        elif [[ "$dir_truncate_root" == "$HOME"* ]]; then
+          current_path="~/$POWERLEVEL9K_SHORTEN_DELIMITER/${dir_truncate_root##*/}${PWD:${#${(S%%)dir_truncate_root//$~zero/}}}"
+        else
+          current_path="/$POWERLEVEL9K_SHORTEN_DELIMITER/${dir_truncate_root##*/}${PWD:${#${(S%%)dir_truncate_root//$~zero/}}}"
+        fi
+      ;;
       *)
         current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
       ;;

From 5cc2d51b5829d0ae2eefaa115892da71f6a14d79 Mon Sep 17 00:00:00 2001
From: Benoit Averty <benoit.averty@gmail.com>
Date: Wed, 10 Aug 2016 13:00:52 +0200
Subject: [PATCH 04/21] Fix bug when truncate root was set to direct subfolder
 of home or root

---
 powerlevel9k.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index c679ba56..afc4a6bc 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -615,7 +615,7 @@ prompt_dir() {
         dir_truncate_root=$(upsearch $POWERLEVEL9K_ROOT_MARKER_FILE)
         zero='%([BSUbfksu]|([FB]|){*})'
 
-        if [[ "$dir_truncate_root" == "/" || "$dir_truncate_root" == "$HOME" ]]; then
+        if [[ "$dir_truncate_root" == "/" || "$dir_truncate_root" == "$HOME" || "${dir_truncate_root%/*}" == "$HOME" || ${dir_truncate_root%/*} == "/" ]]; then
           current_path='%~'
         elif [[ "$dir_truncate_root" == "$HOME"* ]]; then
           current_path="~/$POWERLEVEL9K_SHORTEN_DELIMITER/${dir_truncate_root##*/}${PWD:${#${(S%%)dir_truncate_root//$~zero/}}}"

From 9f4772f9930c7d56ab04df900ac94456e5a08a22 Mon Sep 17 00:00:00 2001
From: Benoit Averty <benoit.averty@gmail.com>
Date: Wed, 10 Aug 2016 21:31:58 +0200
Subject: [PATCH 05/21] More possibilities with truncate folder marker

---
 functions/utilities.zsh | 17 +++++++++--------
 powerlevel9k.zsh-theme  | 30 ++++++++++++++++++------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/functions/utilities.zsh b/functions/utilities.zsh
index 8263ce10..22b53c6a 100644
--- a/functions/utilities.zsh
+++ b/functions/utilities.zsh
@@ -211,15 +211,16 @@ function truncatePathFromRight() {
 
 # Search recursively in parent folders for given file.
 function upsearch () {
-  if test -e "$1"; then
+  if [[ "$PWD" == "$HOME" || "$PWD" == "/" ]]; then
+    echo "$PWD"
+  elif test -e "$1"; then
+    pushd .. > /dev/null
+    upsearch "$1"
+    popd > /dev/null
     echo "$PWD"
   else
-    if [[ "$PWD" == "/" || "$PWD" == "$HOME" ]]; then
-      echo "$PWD";
-    else
-      pushd .. > /dev/null
-      upsearch "$1"
-      popd > /dev/null
-    fi
+    pushd .. > /dev/null
+    upsearch "$1"
+    popd > /dev/null
   fi
 }
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index afc4a6bc..420f7d0b 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -571,7 +571,7 @@ prompt_custom() {
 set_default POWERLEVEL9K_DIR_PATH_SEPARATOR "/"
 prompt_dir() {
   local current_path='%~'
-  if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_root_marker" ]]; then
+  if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then
     set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026'
 
     case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
@@ -609,19 +609,25 @@ prompt_dir() {
           current_path=$(truncatePathFromRight "$(pwd | sed -e "s,^$HOME,~,")" )
         fi
       ;;
-      truncate_with_root_marker)
-        local dir_truncate_root
+      truncate_with_folder_marker)
+        local last_marked_folder marked_folder zero
+        set_default POWERLEVEL9K_SHORTEN_FOLDER_MARKER ".shorten_folder_marker"
+
+        for marked_folder in $(upsearch $POWERLEVEL9K_SHORTEN_FOLDER_MARKER); do
+          if [[ "$marked_folder" == "/" ]]; then
+            current_path="/"
+          elif [[ "$marked_folder" == "$HOME" ]]; then
+            current_path="~"
+          elif [[ "${marked_folder%/*}" == $last_marked_folder ]]; then
+            current_path="${current_path%/}/${marked_folder##*/}"
+          else
+            current_path="${current_path%/}/$POWERLEVEL9K_SHORTEN_DELIMITER/${marked_folder##*/}"
+          fi
+          last_marked_folder=$marked_folder
+        done
 
-        dir_truncate_root=$(upsearch $POWERLEVEL9K_ROOT_MARKER_FILE)
         zero='%([BSUbfksu]|([FB]|){*})'
-
-        if [[ "$dir_truncate_root" == "/" || "$dir_truncate_root" == "$HOME" || "${dir_truncate_root%/*}" == "$HOME" || ${dir_truncate_root%/*} == "/" ]]; then
-          current_path='%~'
-        elif [[ "$dir_truncate_root" == "$HOME"* ]]; then
-          current_path="~/$POWERLEVEL9K_SHORTEN_DELIMITER/${dir_truncate_root##*/}${PWD:${#${(S%%)dir_truncate_root//$~zero/}}}"
-        else
-          current_path="/$POWERLEVEL9K_SHORTEN_DELIMITER/${dir_truncate_root##*/}${PWD:${#${(S%%)dir_truncate_root//$~zero/}}}"
-        fi
+        current_path=$current_path${PWD:${#${(S%%)last_marked_folder//$~zero/}}}
       ;;
       *)
         current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"

From eb865664e4225b94fc01ce1c05f27d1db18e172d Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Thu, 2 Feb 2017 00:31:04 +0100
Subject: [PATCH 06/21] Add comments to the dir segment

---
 powerlevel9k.zsh-theme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 420f7d0b..723954be 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -615,8 +615,10 @@ prompt_dir() {
 
         for marked_folder in $(upsearch $POWERLEVEL9K_SHORTEN_FOLDER_MARKER); do
           if [[ "$marked_folder" == "/" ]]; then
+            # If we reached root folder, stop upsearch.
             current_path="/"
           elif [[ "$marked_folder" == "$HOME" ]]; then
+            # If we reached home folder, stop upsearch.
             current_path="~"
           elif [[ "${marked_folder%/*}" == $last_marked_folder ]]; then
             current_path="${current_path%/}/${marked_folder##*/}"

From ed9d18f1de5d5e0142f40bea452ddc3749967baa Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Thu, 2 Feb 2017 00:31:36 +0100
Subject: [PATCH 07/21] Add documentation for dir truncation strategies

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7a80a09..99f1d6e2 100644
--- a/README.md
+++ b/README.md
@@ -278,9 +278,17 @@ Customizations available are:
 | Variable | Default Value | Description |
 |----------|---------------|-------------|
 |`POWERLEVEL9K_SHORTEN_DIR_LENGTH`|`2`|If your shorten strategy, below, is entire directories, this field determines how many directories to leave at the end. If your shorten strategy is by character count, this field determines how many characters to allow per directory string.|
-|`POWERLEVEL9K_SHORTEN_STRATEGY`|None|How the directory strings should be truncated. By default, it will truncate whole directories. Other options are `truncate_middle`, which leaves the start and end of the directory strings, and `truncate_from_right`, which cuts starting from the end of the string.  You can also use `truncate_with_package_name` to use the `package.json` `name` field to abbreviate the directory path.|
+|`POWERLEVEL9K_SHORTEN_STRATEGY`|None|How the directory strings should be truncated. See the table below for more informations.|
 |`POWERLEVEL9K_SHORTEN_DELIMITER`|`..`|Delimiter to use in truncated strings. This can be any string you choose, including an empty string if you wish to have no delimiter.|
 
+| Strategy Name | Description |
+|---------------|-------------|
+|Default|Truncate whole directories from left. How many is defined by `POWERLEVEL9K_SHORTEN_DIR_LENGTH`|
+|`truncate_middle`|Truncates the middle part of a folder. E.g. you are in a folder named "~/MySuperProjects/AwesomeFiles/BoringOffice", then it will truncated to "~/MyS..cts/Awe..les/BoringOffice", if `POWERLEVEL9K_SHORTEN_DIR_LENGTH=3` is also set (controls the amount of characters to be left).|
+|`truncate_from_right`|Just leaves the beginning of a folder name untouched. E.g. your folders will be truncated like so: "/ro../Pr../office". How many characters will be untouched is controlled by `POWERLEVEL9K_SHORTEN_DIR_LENGTH`.|
+|`truncate_with_package_name`|Use the `package.json` `name` field to abbreviate the directory path.|
+|`truncate_with_folder_marker`|Search for a file that is specified by `POWERLEVEL9K_SHORTEN_FOLDER_MARKER` and truncate everything before that (if found, otherwise stop on $HOME and ROOT).|
+
 For example, if you wanted the truncation behavior of the `fish` shell, which
 truncates `/usr/share/plasma` to `/u/s/plasma`, you would use the following:
 ```zsh

From 268c3247c95eb11c92054465404e37d8877c0f5d Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Fri, 3 Feb 2017 20:21:53 +0100
Subject: [PATCH 08/21] Do path expansion at first

---
 powerlevel9k.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 3010790e..3e529b3b 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -570,7 +570,7 @@ prompt_custom() {
 # Dir: current working directory
 set_default POWERLEVEL9K_DIR_PATH_SEPARATOR "/"
 prompt_dir() {
-  local current_path='%~'
+  local current_path="$(print -P "%~")"
   if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" ]]; then
 
     set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026'
@@ -621,7 +621,7 @@ prompt_dir() {
   fi
 
   if [[ "${POWERLEVEL9K_DIR_PATH_SEPARATOR}" != "/" ]]; then
-    current_path=$(print -P "${current_path}" | sed "s/\//${POWERLEVEL9K_DIR_PATH_SEPARATOR}/g")
+    current_path="$( echo "${current_path}" | sed "s/\//${POWERLEVEL9K_DIR_PATH_SEPARATOR}/g")"
   fi
 
   typeset -AH dir_states

From a8af89eeb7db3980f9bef14a96828fc8c8bdb854 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 4 Feb 2017 08:51:52 +0100
Subject: [PATCH 09/21] Fix default dir truncation strategy

---
 powerlevel9k.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 3e529b3b..37bdbbb8 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -611,7 +611,7 @@ prompt_dir() {
         fi
       ;;
       *)
-        current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
+        current_path="$(print -P "%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c")"
       ;;
     esac
   fi

From 3d451499aaa62f1d01e1d5fb3dd0e274ebcf5ad2 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 4 Feb 2017 08:53:35 +0100
Subject: [PATCH 10/21] Fix tests

---
 test/powerlevel9k.spec | 74 +++++++++++++++++++++++++++---------------
 test/segments/dir.spec | 27 +++++++--------
 2 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/test/powerlevel9k.spec b/test/powerlevel9k.spec
index 1aab2c5f..5f6b6f27 100755
--- a/test/powerlevel9k.spec
+++ b/test/powerlevel9k.spec
@@ -10,86 +10,108 @@ function setUp() {
   # Load Powerlevel9k
   source powerlevel9k.zsh-theme
   source functions/*
+
+  # Unset mode, so that user settings
+  # do not interfere with tests
+  unset POWERLEVEL9K_MODE
 }
 
 function testJoinedSegments() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir dir_joined)
+  cd /tmp
 
-  assertEquals "%K{blue} %F{black}%~ %K{blue}%F{black}%F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black}/tmp %K{blue}%F{black}%F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
+  cd -
 }
 
 function testTransitiveJoinedSegments() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir root_indicator_joined dir_joined)
+  cd /tmp
 
-  assertEquals "%K{blue} %F{black}%~ %K{blue}%F{black}%F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black}/tmp %K{blue}%F{black}%F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
+  cd -
 }
 
 function testJoiningWithConditionalSegment() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir background_jobs dir_joined)
+  cd /tmp
 
-  assertEquals "%K{blue} %F{black}%~ %K{blue}%F{black} %F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black}/tmp %K{blue}%F{black} %F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
+  cd -
 }
 
 function testDynamicColoringOfSegmentsWork() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND='red'
+  POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='red'
+  cd /tmp
 
-  assertEquals "%K{red} %F{black}%~ %k%F{red}%f " "$(build_left_prompt)"
+  assertEquals "%K{red} %F{black}/tmp %k%F{red}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND
+  unset POWERLEVEL9K_DIR_DEFAULT_BACKGROUND
+  cd -
 }
 
 function testDynamicColoringOfVisualIdentifiersWork() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_MODE='awesome-patched'
-  POWERLEVEL9K_DIR_HOME_SUBFOLDER_VISUAL_IDENTIFIER_COLOR='green'
+  POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR='green'
+  POWERLEVEL9K_FOLDER_ICON="icon-here"
 
-  # Re-Source the icons, as the POWERLEVEL9K_MODE is directly
-  # evaluated there.
-  source functions/icons.zsh
+  cd /tmp
 
-  assertEquals "%K{blue} %F{green%}%f %F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{green%}icon-here%f %F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_MODE
-  unset POWERLEVEL9K_DIR_HOME_SUBFOLDER_VISUAL_IDENTIFIER_COLOR
+  unset POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR
+  unset POWERLEVEL9K_FOLDER_ICON
+  cd -
 }
 
 function testColoringOfVisualIdentifiersDoesNotOverwriteColoringOfSegment() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_MODE='awesome-patched'
-  POWERLEVEL9K_DIR_HOME_SUBFOLDER_VISUAL_IDENTIFIER_COLOR='green'
-  POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND='red'
-  POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND='yellow'
+  POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR='green'
+  POWERLEVEL9K_DIR_DEFAULT_FOREGROUND='red'
+  POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='yellow'
+  POWERLEVEL9K_FOLDER_ICON="icon-here"
 
   # Re-Source the icons, as the POWERLEVEL9K_MODE is directly
   # evaluated there.
   source functions/icons.zsh
 
-  assertEquals "%K{yellow} %F{green%}%f %F{red}%~ %k%F{yellow}%f " "$(build_left_prompt)"
+  cd /tmp
+
+  assertEquals "%K{yellow} %F{green%}icon-here%f %F{red}/tmp %k%F{yellow}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_MODE
-  unset POWERLEVEL9K_DIR_HOME_SUBFOLDER_VISUAL_IDENTIFIER_COLOR
-  unset POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND
-  unset POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND
+  unset POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR
+  unset POWERLEVEL9K_DIR_DEFAULT_FOREGROUND
+  unset POWERLEVEL9K_DIR_DEFAULT_BACKGROUND
+  unset POWERLEVEL9K_FOLDER_ICON
+  cd -
 }
 
 function testOverwritingIconsWork() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_HOME_SUB_ICON='icon-here'
+  POWERLEVEL9K_FOLDER_ICON='icon-here'
+  #local testFolder=$(mktemp -d -p p9k)
+  # Move testFolder under home folder
+  #mv testFolder ~
+  # Go into testFolder
+  #cd ~/$testFolder
 
-  assertEquals "%K{blue} %F{black%}icon-here%f %F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  cd /tmp
+  assertEquals "%K{blue} %F{black%}icon-here%f %F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
 
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_DIR_HOME_SUB_ICON
+  unset POWERLEVEL9K_DIR_FOLDER_ICON
+  cd -
+  # rm -fr ~/$testFolder
 }
 
 source shunit2/source/2.1/src/shunit2
diff --git a/test/segments/dir.spec b/test/segments/dir.spec
index 840a298b..a5378ab6 100755
--- a/test/segments/dir.spec
+++ b/test/segments/dir.spec
@@ -9,10 +9,16 @@ function setUp() {
   export TERM="xterm-256color"
   # Load Powerlevel9k
   source powerlevel9k.zsh-theme
+
+  # Every test should at least use the dir segment
+  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
+}
+
+function tearDown() {
+  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
 }
 
 function testTruncateFoldersWorks() {
-  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
   POWERLEVEL9K_SHORTEN_STRATEGY='truncate_folders'
 
@@ -20,19 +26,17 @@ function testTruncateFoldersWorks() {
   mkdir -p $FOLDER
   cd $FOLDER
 
-  assertEquals "%K{blue} %F{black}%3(c:…/:)%2c %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black}…/12345678/123456789 %k%F{blue}%f " "$(build_left_prompt)"
 
   cd -
   rm -fr /tmp/powerlevel9k-test
 
   unset FOLDER
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
   unset POWERLEVEL9K_SHORTEN_STRATEGY
 }
 
 function testTruncateMiddleWorks() {
-  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
   POWERLEVEL9K_SHORTEN_STRATEGY='truncate_middle'
 
@@ -47,12 +51,10 @@ function testTruncateMiddleWorks() {
 
   unset FOLDER
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
   unset POWERLEVEL9K_SHORTEN_STRATEGY
 }
 
 function testTruncationFromRightWorks() {
-  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
   POWERLEVEL9K_SHORTEN_STRATEGY='truncate_from_right'
 
@@ -66,52 +68,45 @@ function testTruncationFromRightWorks() {
   rm -fr /tmp/powerlevel9k-test
 
   unset FOLDER
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
   unset POWERLEVEL9K_SHORTEN_STRATEGY
 }
 
 function testHomeFolderDetectionWorks() {
-  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_HOME_ICON='home-icon'
 
   cd ~
-  assertEquals "%K{blue} %F{black%}home-icon%f %F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black%}home-icon%f %F{black}~ %k%F{blue}%f " "$(build_left_prompt)"
 
   cd -
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   unset POWERLEVEL9K_HOME_ICON
 }
 
 function testHomeSubfolderDetectionWorks() {
-  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_HOME_SUB_ICON='sub-icon'
 
   FOLDER=~/powerlevel9k-test
   mkdir $FOLDER
   cd $FOLDER
-  assertEquals "%K{blue} %F{black%}sub-icon%f %F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black%}sub-icon%f %F{black}~/powerlevel9k-test %k%F{blue}%f " "$(build_left_prompt)"
 
   cd -
   rm -fr $FOLDER
   unset FOLDER
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   unset POWERLEVEL9K_HOME_SUB_ICON
 }
 
 function testOtherFolderDetectionWorks() {
-  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_FOLDER_ICON='folder-icon'
 
   FOLDER=/tmp/powerlevel9k-test
   mkdir $FOLDER
   cd $FOLDER
-  assertEquals "%K{blue} %F{black%}folder-icon%f %F{black}%~ %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{blue} %F{black%}folder-icon%f %F{black}/tmp/powerlevel9k-test %k%F{blue}%f " "$(build_left_prompt)"
 
   cd -
   rm -fr $FOLDER
   unset FOLDER
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   unset POWERLEVEL9K_FOLDER_ICON
 }
 

From b6e55c189e6a7958164304cf5ffd7766ffe8f3bf Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 4 Feb 2017 09:13:02 +0100
Subject: [PATCH 11/21] Add tests for omitting first character in `dir` segment

---
 test/segments/dir.spec | 103 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/test/segments/dir.spec b/test/segments/dir.spec
index a5378ab6..747ab385 100755
--- a/test/segments/dir.spec
+++ b/test/segments/dir.spec
@@ -110,4 +110,107 @@ function testOtherFolderDetectionWorks() {
   unset POWERLEVEL9K_FOLDER_ICON
 }
 
+function testChangingDirPathSeparator() {
+  POWERLEVEL9K_DIR_PATH_SEPARATOR='xXx'
+  local FOLDER="/tmp/powerlevel9k-test/1/2"
+  mkdir -p $FOLDER
+  cd $FOLDER
+
+  assertEquals "%K{blue} %F{black}xXxtmpxXxpowerlevel9k-testxXx1xXx2 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  unset FOLDER
+  rm -fr /tmp/powerlevel9k-test
+  unset POWERLEVEL9K_DIR_PATH_SEPARATOR
+}
+
+function testOmittingFirstCharacterWorks() {
+  POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER=true
+  POWERLEVEL9K_FOLDER_ICON='folder-icon'
+  cd /tmp
+
+  assertEquals "%K{blue} %F{black%}folder-icon%f %F{black}tmp %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  unset POWERLEVEL9K_FOLDER_ICON
+  unset POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
+}
+
+function testOmittingFirstCharacterWorksWithChangingPathSeparator() {
+  POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER=true
+  POWERLEVEL9K_DIR_PATH_SEPARATOR='xXx'
+  POWERLEVEL9K_FOLDER_ICON='folder-icon'
+  mkdir -p /tmp/powerlevel9k-test/1/2
+  cd /tmp/powerlevel9k-test/1/2
+
+  assertEquals "%K{blue} %F{black%}folder-icon%f %F{black}tmpxXxpowerlevel9k-testxXx1xXx2 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  rm -fr /tmp/powerlevel9k-test
+  unset POWERLEVEL9K_FOLDER_ICON
+  unset POWERLEVEL9K_DIR_PATH_SEPARATOR
+  unset POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
+}
+
+# This test makes it obvious that combining a truncation strategy
+# that cuts off folders from the left and omitting the the first
+# character does not make much sense. The truncation strategy
+# comes first, prints an ellipsis and that gets then cut off by
+# POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER..
+# But it does more sense in combination with other truncation
+# strategies.
+function testOmittingFirstCharacterWorksWithChangingPathSeparatorAndDefaultTruncation() {
+  POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER=true
+  POWERLEVEL9K_DIR_PATH_SEPARATOR='xXx'
+  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+  POWERLEVEL9K_SHORTEN_STRATEGY='truncate_folders'
+  mkdir -p /tmp/powerlevel9k-test/1/2
+  cd /tmp/powerlevel9k-test/1/2
+
+  assertEquals "%K{blue} %F{black}xXx1xXx2 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  rm -fr /tmp/powerlevel9k-test
+  unset POWERLEVEL9K_DIR_PATH_SEPARATOR
+  unset POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
+  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
+  unset POWERLEVEL9K_SHORTEN_STRATEGY
+}
+
+function testOmittingFirstCharacterWorksWithChangingPathSeparatorAndMiddleTruncation() {
+  POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER=true
+  POWERLEVEL9K_DIR_PATH_SEPARATOR='xXx'
+  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+  POWERLEVEL9K_SHORTEN_STRATEGY='truncate_middle'
+  mkdir -p /tmp/powerlevel9k-test/1/2
+  cd /tmp/powerlevel9k-test/1/2
+
+  assertEquals "%K{blue} %F{black}tmpxXxpo…stxXx1xXx2 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  rm -fr /tmp/powerlevel9k-test
+  unset POWERLEVEL9K_DIR_PATH_SEPARATOR
+  unset POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
+  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
+  unset POWERLEVEL9K_SHORTEN_STRATEGY
+}
+
+function testOmittingFirstCharacterWorksWithChangingPathSeparatorAndRightTruncation() {
+  POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER=true
+  POWERLEVEL9K_DIR_PATH_SEPARATOR='xXx'
+  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+  POWERLEVEL9K_SHORTEN_STRATEGY='truncate_from_right'
+  mkdir -p /tmp/powerlevel9k-test/1/2
+  cd /tmp/powerlevel9k-test/1/2
+
+  assertEquals "%K{blue} %F{black}tmpxXxpo…xXx1xXx2 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  rm -fr /tmp/powerlevel9k-test
+  unset POWERLEVEL9K_DIR_PATH_SEPARATOR
+  unset POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
+  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
+  unset POWERLEVEL9K_SHORTEN_STRATEGY
+}
+
 source shunit2/source/2.1/src/shunit2

From 8e99944797b171b84bd347cc8b9c065d7298d25c Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sun, 5 Feb 2017 14:34:56 +0100
Subject: [PATCH 12/21] Add test for truncate_with_folder_marker truncation
 strategy

---
 test/segments/dir.spec | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/test/segments/dir.spec b/test/segments/dir.spec
index 840a298b..0f253ac3 100755
--- a/test/segments/dir.spec
+++ b/test/segments/dir.spec
@@ -71,6 +71,52 @@ function testTruncationFromRightWorks() {
   unset POWERLEVEL9K_SHORTEN_STRATEGY
 }
 
+function testTruncateWithFolderMarkerWorks() {
+  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
+  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+  POWERLEVEL9K_SHORTEN_STRATEGY="truncate_with_folder_marker"
+
+  local BASEFOLDER=/tmp/powerlevel9k-test
+  local FOLDER=$BASEFOLDER/1/12/123/1234/12345/123456/1234567
+  mkdir -p $FOLDER
+  # Setup folder marker
+  touch $BASEFOLDER/1/12/.shorten_folder_marker
+  cd $FOLDER
+  assertEquals "%K{blue} %F{black}/…/12/123/1234/12345/123456/1234567 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  rm -fr $BASEFOLDER
+  unset BASEFOLDER
+  unset FOLDER
+  unset POWERLEVEL9K_SHORTEN_STRATEGY
+  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
+  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
+}
+
+function testTruncateWithFolderMarkerWithChangedFolderMarker() {
+  POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
+  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
+  POWERLEVEL9K_SHORTEN_STRATEGY="truncate_with_folder_marker"
+  POWERLEVEL9K_SHORTEN_FOLDER_MARKER='.xxx'
+
+  local BASEFOLDER=/tmp/powerlevel9k-test
+  local FOLDER=$BASEFOLDER/1/12/123/1234/12345/123456/1234567
+  mkdir -p $FOLDER
+  # Setup folder marker
+  touch $BASEFOLDER/1/12/.xxx
+  cd $FOLDER
+  assertEquals "%K{blue} %F{black}/…/12/123/1234/12345/123456/1234567 %k%F{blue}%f " "$(build_left_prompt)"
+
+  cd -
+  rm -fr $BASEFOLDER
+  unset BASEFOLDER
+  unset FOLDER
+  unset POWERLEVEL9K_SHORTEN_FOLDER_MARKER
+  unset POWERLEVEL9K_SHORTEN_STRATEGY
+  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
+  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
+}
+
 function testHomeFolderDetectionWorks() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
   POWERLEVEL9K_HOME_ICON='home-icon'

From 7e25fa1e93fbb02e2276e1d245748d09c7c63e8a Mon Sep 17 00:00:00 2001
From: Christian Rebischke <Chris.Rebischke@posteo.de>
Date: Fri, 10 Feb 2017 17:12:05 +0100
Subject: [PATCH 13/21] Added additional ssh identifier for the right
 statusbar.

---
 README.md              | 1 +
 powerlevel9k.zsh-theme | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index cd7920e7..82b7ab41 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ The segments that are currently available are:
 * `swap` - Prints the current swap size.
 * [`time`](#time) - System time.
 * [`vi_mode`](#vi_mode)- Your prompt's Vi editing mode (NORMAL|INSERT).
+* `SSH` - Additional Identifier for SSH Sessions.
 
 **Development Environment Segments:**
 * [`vcs`](#vcs) - Information about this `git` or `hg` repository (if you are in one).
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 1fdedd6b..57d63005 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -670,6 +670,13 @@ prompt_history() {
   "$1_prompt_segment" "$0" "$2" "244" "$DEFAULT_COLOR" '%h'
 }
 
+prompt_detect_ssh(){
+  local color="yellow"
+  if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
+    "$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR" "$color" "ssh"
+  fi
+}
+
 # Detection for virtualization (systemd based systems only)
 prompt_detect_virt() {
   if ! command -v systemd-detect-virt;then

From a4cb875615bedc305168c694793616de8d72c1b3 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sun, 12 Feb 2017 23:27:16 +0100
Subject: [PATCH 14/21] Add documentation about mysterious 'BSUbfksu' pattern

---
 powerlevel9k.zsh-theme | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index d51ec8f2..e6befc6d 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -591,7 +591,12 @@ prompt_dir() {
           package_path=${$(pwd)%%/.git*}
         fi
 
-        zero='%([BSUbfksu]|([FB]|){*})'
+        # Replace the shortest possible match of the marked folder from
+        # the current path. Remove the amount of characters up to the
+        # folder marker from the left. Count only the visible characters
+        # in the path (this is done by the "zero" pattern; see
+        # http://stackoverflow.com/a/40855342/5586433).
+        local zero='%([BSUbfksu]|([FB]|){*})'
         current_dir=$(pwd)
         # Then, find the length of the package_path string, and save the
         # subdirectory path as a substring of the current directory's path from 0
@@ -613,6 +618,9 @@ prompt_dir() {
         local last_marked_folder marked_folder zero
         set_default POWERLEVEL9K_SHORTEN_FOLDER_MARKER ".shorten_folder_marker"
 
+        # Search for the folder marker in the parent directories and
+        # buildup a pattern that is removed from the current path
+        # later on.
         for marked_folder in $(upsearch $POWERLEVEL9K_SHORTEN_FOLDER_MARKER); do
           if [[ "$marked_folder" == "/" ]]; then
             # If we reached root folder, stop upsearch.
@@ -628,7 +636,12 @@ prompt_dir() {
           last_marked_folder=$marked_folder
         done
 
-        zero='%([BSUbfksu]|([FB]|){*})'
+        # Replace the shortest possible match of the marked folder from
+        # the current path. Remove the amount of characters up to the
+        # folder marker from the left. Count only the visible characters
+        # in the path (this is done by the "zero" pattern; see
+        # http://stackoverflow.com/a/40855342/5586433).
+        local zero='%([BSUbfksu]|([FB]|){*})'
         current_path=$current_path${PWD:${#${(S%%)last_marked_folder//$~zero/}}}
       ;;
       *)

From f6c65e3cf7b87a07b7dffb0c3d77a6932241c242 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Mon, 13 Feb 2017 00:18:34 +0100
Subject: [PATCH 15/21] Get rid of unreadable BSU-pattern

Now the current folder in `truncate_with_folder_marker` strategy is
truncated by cutting off the found folder from the beginning of $PWD.
---
 powerlevel9k.zsh-theme | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index e6befc6d..55e33680 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -615,7 +615,7 @@ prompt_dir() {
         fi
       ;;
       truncate_with_folder_marker)
-        local last_marked_folder marked_folder zero
+        local last_marked_folder marked_folder
         set_default POWERLEVEL9K_SHORTEN_FOLDER_MARKER ".shorten_folder_marker"
 
         # Search for the folder marker in the parent directories and
@@ -637,12 +637,8 @@ prompt_dir() {
         done
 
         # Replace the shortest possible match of the marked folder from
-        # the current path. Remove the amount of characters up to the
-        # folder marker from the left. Count only the visible characters
-        # in the path (this is done by the "zero" pattern; see
-        # http://stackoverflow.com/a/40855342/5586433).
-        local zero='%([BSUbfksu]|([FB]|){*})'
-        current_path=$current_path${PWD:${#${(S%%)last_marked_folder//$~zero/}}}
+        # the current path.
+        current_path=$current_path${PWD#${last_marked_folder}*}
       ;;
       *)
         current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"

From 6e1259ee99a51a8cb52f975ebb45ede2792a4730 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Mon, 13 Feb 2017 00:20:01 +0100
Subject: [PATCH 16/21] Remove unnecessary variable from tests

---
 test/segments/dir.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/segments/dir.spec b/test/segments/dir.spec
index 0f253ac3..69359e25 100755
--- a/test/segments/dir.spec
+++ b/test/segments/dir.spec
@@ -73,7 +73,6 @@ function testTruncationFromRightWorks() {
 
 function testTruncateWithFolderMarkerWorks() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
   POWERLEVEL9K_SHORTEN_STRATEGY="truncate_with_folder_marker"
 
   local BASEFOLDER=/tmp/powerlevel9k-test
@@ -89,13 +88,11 @@ function testTruncateWithFolderMarkerWorks() {
   unset BASEFOLDER
   unset FOLDER
   unset POWERLEVEL9K_SHORTEN_STRATEGY
-  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
 }
 
 function testTruncateWithFolderMarkerWithChangedFolderMarker() {
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
   POWERLEVEL9K_SHORTEN_STRATEGY="truncate_with_folder_marker"
   POWERLEVEL9K_SHORTEN_FOLDER_MARKER='.xxx'
 
@@ -113,7 +110,6 @@ function testTruncateWithFolderMarkerWithChangedFolderMarker() {
   unset FOLDER
   unset POWERLEVEL9K_SHORTEN_FOLDER_MARKER
   unset POWERLEVEL9K_SHORTEN_STRATEGY
-  unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
 }
 

From f68e055f3bf0403cb4c4a9b3b79adb8471fe3872 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Mon, 13 Feb 2017 21:50:37 -0500
Subject: [PATCH 17/21] Merging the `ssh` detection into `context` segment,
 resolving conflicts.

---
 README.md              | 20 ++++++++------------
 powerlevel9k.zsh-theme | 32 +++++++++++++-------------------
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 3b7542fc..d6de6843 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ The segments that are currently available are:
 **System Status Segments:**
 * [`background_jobs`](#background_jobs) - Indicator for background jobs.
 * [`battery`](#battery) - Current battery status.
-* [`context`](#context) - Your username and host.
+* [`context`](#context) - Your username and host, conditionalized based on $USER and SSH status.
 * [`dir`](#dir) - Your current working directory.
 * `dir_writable` - Displays a lock icon, if you do not have write permissions on the current folder.
 * [`disk_usage`](#disk_usage) - Disk usage of your current partition.
@@ -238,29 +238,25 @@ main theme distribution so that everyone can use it!
 
 ##### context
 
-The `context` segment (user@host string) is conditional. This lets you enable
-it, but only display it if you are not your normal user or on a remote host
-(basically, only print it when it's likely you need it).
+The `context` segment (user@host string) is conditional. By default, it will
+only print if you are not your 'normal' user (including if you are root), or if
+you are SSH'd to a remote host.
 
 To use this feature, make sure the `context` segment is enabled in your prompt
 elements (it is by default), and define a `DEFAULT_USER` in your `~/.zshrc`:
 
 You can set the `POWERLEVEL9K_CONTEXT_HOST_DEPTH` variable to change how the
 hostname is displayed. See (ZSH Manual)[http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Login-information]
-for details. Default is set to %m which will show the hostname up to the first ‘.’
+for details. The default is set to %m which will show the hostname up to the first ‘.’
 You can set it to %{N}m where N is an integer to show that many segments of system
 hostname. Setting N to a negative integer will show that many segments from the
 end of the hostname.
 
 | Variable | Default Value | Description |
 |----------|---------------|-------------|
-|`DEFAULT_USER`|None|Username to consider a "default context" (you can also use `$USER`)|
-|`POWERLEVEL9K_CONTEXT_HOST_DEPTH`|%m|Customizable host depth on prompt|
-
-You can use POWERLEVEL9K_HIDE_HOST for hiding the hostname in the prompt
-when you are not in a ssh session. For example:
-
-    POWERLEVEL9K_HIDE_HOST="yes"
+|`DEFAULT_USER`|None|Username to consider a "default context".|
+|`POWERLEVEL9K_CONTEXT_HOST_DEPTH`|%m|Customizable host depth on prompt.|
+|`POWERLEVEL9K_ALWAYS_SHOW_CONTEXT`|false|Always show this segment.|
 
 ##### dir
 
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index b1de8f84..49fdaf09 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -537,26 +537,27 @@ prompt_public_ip() {
 
 # Context: user@hostname (who am I and where am I)
 # Note that if $DEFAULT_USER is not set, this prompt segment will always print
+set_default POWERLEVEL9K_ALWAYS_SHOW_CONTEXT false
+set_default POWERLEVEL9K_CONTEXT_HOST_DEPTH "%m"
 prompt_context() {
   local current_state="DEFAULT"
-  declare -A context_states
+  typeset -AH context_states
   context_states=(
     "ROOT"      "yellow"
     "DEFAULT"   "011"
   )
+
   local content="$USER"
-  if [[ "$USER" != "$DEFAULT_USER" ]]; then
-    if [[ $(print -P "%#") == '#' ]]; then
-      current_state="ROOT"
-    fi
-    if [[ -z "$SSH_CLIENT" && -z "$SSH_TTY" ]]; then
-      if [[ "$POWERLEVEL9K_HIDE_HOST" == "false" || -z "$POWERLEVEL9K_HIDE_HOST"  ]]; then
-        content="${content}@%m"
+
+  if [[ "POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
+
+      if [[ $(print -P "%#") == '#' ]]; then
+        current_state="ROOT"
       fi
-    else
-      content="${content}@%m"
-    fi
-    "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}"
+
+      content="${content}@${POWERLEVEL9K_CONTEXT_HOST_DEPTH}"
+
+      "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}"
   fi
 }
 
@@ -704,13 +705,6 @@ prompt_history() {
   "$1_prompt_segment" "$0" "$2" "244" "$DEFAULT_COLOR" '%h'
 }
 
-prompt_detect_ssh(){
-  local color="yellow"
-  if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
-    "$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR" "$color" "ssh"
-  fi
-}
-
 # Detection for virtualization (systemd based systems only)
 prompt_detect_virt() {
   if ! command -v systemd-detect-virt;then

From 3de352b29627e39dc58ffa5b834e0e23531d95dc Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Mon, 13 Feb 2017 22:07:23 -0500
Subject: [PATCH 18/21] Adding `ssh` segment back with some minor changes.

---
 README.md              | 2 +-
 functions/icons.zsh    | 3 +++
 powerlevel9k.zsh-theme | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6de6843..22608cce 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ The segments that are currently available are:
 * `swap` - Prints the current swap size.
 * [`time`](#time) - System time.
 * [`vi_mode`](#vi_mode)- Your prompt's Vi editing mode (NORMAL|INSERT).
-* `SSH` - Additional Identifier for SSH Sessions.
+* `ssh` - Indicates whether or not you are in an SSH session.
 
 **Development Environment Segments:**
 * [`vcs`](#vcs) - Information about this `git` or `hg` repository (if you are in one).
diff --git a/functions/icons.zsh b/functions/icons.zsh
index 44d99095..3000f4a6 100644
--- a/functions/icons.zsh
+++ b/functions/icons.zsh
@@ -79,6 +79,7 @@ case $POWERLEVEL9K_MODE in
       SWIFT_ICON                     ''
       PUBLIC_IP_ICON                 ''
       LOCK_ICON                      $'\UE138'              # 
+      SSH_ICON                       '(ssh)'
     )
   ;;
   'awesome-fontconfig')
@@ -140,6 +141,7 @@ case $POWERLEVEL9K_MODE in
       SWIFT_ICON                     ''
       PUBLIC_IP_ICON                 ''
       LOCK_ICON                      $'\UE138'              # 
+      SSH_ICON                       '(ssh)'
     )
   ;;
   *)
@@ -201,6 +203,7 @@ case $POWERLEVEL9K_MODE in
       SWIFT_ICON                     'Swift'
       PUBLIC_IP_ICON                 ''
       LOCK_ICON                      $'\UE0A2'
+      SSH_ICON                       '(ssh)'
     )
   ;;
 esac
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 49fdaf09..10b2b011 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -933,6 +933,12 @@ prompt_rvm() {
   fi
 }
 
+prompt_ssh() {
+  if [[ -n "$SSH_CLIENT" ]] || [[ -n "$SSH_TTY" ]]; then
+    "$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR" "yellow" "" 'SSH_ICON'
+  fi
+}
+
 # Status: return code if verbose, otherwise just an icon if an error occurred
 set_default POWERLEVEL9K_STATUS_VERBOSE true
 set_default POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE false

From 6512796afe15cac86ab52972f582b32fd769edac Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Mon, 13 Feb 2017 22:29:58 -0500
Subject: [PATCH 19/21] Trying to enable always showing user, not working

---
 powerlevel9k.zsh-theme | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 10b2b011..cf6ad5df 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -538,6 +538,7 @@ prompt_public_ip() {
 # Context: user@hostname (who am I and where am I)
 # Note that if $DEFAULT_USER is not set, this prompt segment will always print
 set_default POWERLEVEL9K_ALWAYS_SHOW_CONTEXT false
+set_default POWERLEVEL9K_ALWAYS_SHOW_USER false
 set_default POWERLEVEL9K_CONTEXT_HOST_DEPTH "%m"
 prompt_context() {
   local current_state="DEFAULT"
@@ -547,7 +548,7 @@ prompt_context() {
     "DEFAULT"   "011"
   )
 
-  local content="$USER"
+  local content=""
 
   if [[ "POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
 
@@ -555,10 +556,15 @@ prompt_context() {
         current_state="ROOT"
       fi
 
-      content="${content}@${POWERLEVEL9K_CONTEXT_HOST_DEPTH}"
+      content="$USER@${POWERLEVEL9K_CONTEXT_HOST_DEPTH}"
 
-      "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}"
+  elif [[ "POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]]; then
+      content="$USER"
+  else
+      return
   fi
+
+  "$1_prompt_segment" "${0}_${current_state}" "$2" "$DEFAULT_COLOR" "${context_states[$current_state]}" "${content}"
 }
 
 # The 'custom` prompt provides a way for users to invoke commands and display

From c65e3217b5fcecf84773c0c9a8a5805a9a97d812 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Tue, 14 Feb 2017 08:58:40 -0500
Subject: [PATCH 20/21] context: fixing conditionals in for always showing
 $USER

---
 powerlevel9k.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index cf6ad5df..5960dbe8 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -550,7 +550,7 @@ prompt_context() {
 
   local content=""
 
-  if [[ "POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
+  if [[ "$POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
 
       if [[ $(print -P "%#") == '#' ]]; then
         current_state="ROOT"
@@ -558,7 +558,7 @@ prompt_context() {
 
       content="$USER@${POWERLEVEL9K_CONTEXT_HOST_DEPTH}"
 
-  elif [[ "POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]]; then
+  elif [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]]; then
       content="$USER"
   else
       return

From 04284abe14a8b578b1c3e824cf96f0a0768b9161 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Tue, 14 Feb 2017 09:00:12 -0500
Subject: [PATCH 21/21] README: updating to reflect new context segment
 features

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 22608cce..6aaaf1c8 100644
--- a/README.md
+++ b/README.md
@@ -256,7 +256,8 @@ end of the hostname.
 |----------|---------------|-------------|
 |`DEFAULT_USER`|None|Username to consider a "default context".|
 |`POWERLEVEL9K_CONTEXT_HOST_DEPTH`|%m|Customizable host depth on prompt.|
-|`POWERLEVEL9K_ALWAYS_SHOW_CONTEXT`|false|Always show this segment.|
+|`POWERLEVEL9K_ALWAYS_SHOW_CONTEXT`|false|Always show this segment, including $USER and hostname.|
+|`POWERLEVEL9K_ALWAYS_SHOW_USER`|false|Always show the username, but conditionalize the hostname.|
 
 ##### dir