Merge branch 'detect-virt' into detect-virt-next

1 files changed, 27 insertions, 7 deletions

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index c4b24b55..f55f4811 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -41,7 +41,7 @@ else
   POWERLEVEL9K_INSTALLATION_PATH="$0"
 fi
 
-# Resolve the instllation path
+# Resolve the installation path
 if [[ -L "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
   # If this theme is sourced as a symlink, we need to locate the real URL
   filename="$(realpath -P $POWERLEVEL9K_INSTALLATION_PATH 2>/dev/null || readlink -f $POWERLEVEL9K_INSTALLATION_PATH 2>/dev/null || perl -MCwd=abs_path -le 'print abs_path readlink(shift);' $POWERLEVEL9K_INSTALLATION_PATH 2>/dev/null)"
@@ -103,10 +103,10 @@ fi
 #
 # Methodology behind user-defined variables overwriting colors:
 #     The first parameter to the segment constructors is the calling function's
-#     name.  From this function name, we strip the "prompt_"-prefix and
-#     uppercase it.  This is then prefixed with "POWERLEVEL9K_" and suffixed
+#     name. From this function name, we strip the "prompt_"-prefix and
+#     uppercase it. This is then prefixed with "POWERLEVEL9K_" and suffixed
 #     with either "_BACKGROUND" or "_FOREGROUND", thus giving us the variable
-#     name. So each new segment is user-overwritable by a variable following
+#     name. So each new segment is user-overwritten by a variable following
 #     this naming convention.
 ################################################################
 
@@ -117,7 +117,7 @@ CURRENT_BG='NONE'
 
 # Begin a left prompt segment
 # Takes four arguments:
-#   * $1: Name of the function that was orginally invoked (mandatory).
+#   * $1: Name of the function that was originally invoked (mandatory).
 #         Necessary, to make the dynamic color-overwrite mechanism work.
 #   * $2: The array index of the current segment
 #   * $3: Background color
@@ -207,7 +207,7 @@ CURRENT_RIGHT_BG='NONE'
 
 # Begin a right prompt segment
 # Takes four arguments:
-#   * $1: Name of the function that was orginally invoked (mandatory).
+#   * $1: Name of the function that was originally invoked (mandatory).
 #         Necessary, to make the dynamic color-overwrite mechanism work.
 #   * $2: The array index of the current segment
 #   * $3: Background color
@@ -547,6 +547,26 @@ prompt_history() {
   "$1_prompt_segment" "$0" "$2" "244" "$DEFAULT_COLOR" '%h'
 }
 
+# Detection for virtualization (systemd based systems only)
+prompt_detect_virt() {
+  if ! command -v systemd-detect-virt;then
+    return
+  fi
+  local virt=$(systemd-detect-virt)
+  local color="yellow"
+  if [[ "$virt" == "none" ]]; then
+    if [[ "$(ls -di / | grep -o 2)" != "2" ]]; then
+      virt="chroot"
+      "$1_prompt_segment" "$0" "$2" "$color" "$DEFAULT_COLOR" "$virt"
+    else
+      ;
+    fi
+  else
+    "$1_prompt_segment" "$0" "$2" "$color" "$DEFAULT_COLOR" "$virt"
+  fi
+}
+
+
 prompt_icons_test() {
   for key in ${(@k)icons}; do
     # The lower color spectrum in ZSH makes big steps. Choosing
@@ -1024,7 +1044,7 @@ powerlevel9k_prepare_prompts() {
 $(print_icon 'MULTILINE_SECOND_PROMPT_PREFIX')"
     if [[ "$POWERLEVEL9K_RPROMPT_ON_NEWLINE" != true ]]; then
       # The right prompt should be on the same line as the first line of the left
-      # prompt.  To do so, there is just a quite ugly workaround: Before zsh draws
+      # prompt. To do so, there is just a quite ugly workaround: Before zsh draws
       # the RPROMPT, we advise it, to go one line up. At the end of RPROMPT, we
       # advise it to go one line down. See:
       # http://superuser.com/questions/357107/zsh-right-justify-in-ps1