Adds compact support to powerline themes

themes/powerline/README.md

@@ -79,3 +79,18 @@ A variable can be defined to set the order of the prompt segments:
     POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
 
 The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+### Compact Settings
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+| Variable                             | Description
+|--------------------------------------|------------
+|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
+|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
+|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
+|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
+|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
+|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
+
+The default value for all settings is `0` (disabled). Use `1` to enable.

themes/powerline/powerline.base.bash

@@ -193,22 +193,37 @@ function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
-  local separator_char="${POWERLINE_LEFT_SEPARATOR}"
-  local separator_char_soft="${POWERLINE_LEFT_SEPARATOR_SOFT}"
-  local separator=""
+  local pad_before_segment=" "
 
-  if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
+  if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
+    if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+  else
+    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    # Since the previous segment wasn't the last segment, add padding, if needed
+    #
+    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
+      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+    fi
     if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-      separator="$(set_color - ${LAST_SEGMENT_COLOR})${separator_char_soft}${normal}"
+      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_SEPARATOR_SOFT}${normal}"
     else
-      separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
+      LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${POWERLINE_LEFT_SEPARATOR}${normal}"
     fi
   fi
-  LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}"
+
+  LEFT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
   (( SEGMENTS_AT_LEFT += 1 ))
 }
 
+function __powerline_left_last_segment_padding {
+  LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+}
+
 function __powerline_last_status_prompt {
   [[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
 }
@@ -234,6 +249,10 @@ function __powerline_prompt_command {
 
   [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
 
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+    __powerline_left_last_segment_padding
+  fi
+
   # By default we try to match the prompt to the adjacent segment's background color,
   # but when part of the prompt exists within that segment, we instead match the foreground color.
   local prompt_color="$(set_color ${LAST_SEGMENT_COLOR} -)"
@@ -243,7 +262,11 @@ function __powerline_prompt_command {
   fi
   [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal}"
 
-  PS1="${LEFT_PROMPT} "
+  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+    LEFT_PROMPT+=" "
+  fi
+
+  PS1="${LEFT_PROMPT}"
 
   ## cleanup ##
   unset LAST_SEGMENT_COLOR \

themes/powerline/powerline.theme.bash

@@ -7,6 +7,13 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
 POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
 POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR=${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:=""}
 
+POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
+POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}