syntax refactor

Copied from zimfw/zimfw@9f83898
zimfw · Dec 26, 2018 · 34e45e0 · 34e45e0
1 parent f6fc617
commit 34e45e0
Showing 1 changed file with 77 additions and 79 deletions.
diff --git a/steeef.zsh-theme b/steeef.zsh-theme
@@ -9,97 +9,95 @@
 
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
-function virtualenv_info {
-    [ $VIRTUAL_ENV ] && print '('${fg[blue]}`basename $VIRTUAL_ENV`%{${reset_color}%}') '
+virtualenv_info() {
+  [ ${VIRTUAL_ENV} ] && print '('${fg[blue]}${VIRTUAL_ENV:t}%{${reset_color}%}') '
 }
 
-function steeef_preexec {
-    case "$(history $HISTCMD)" in
-        *git*)
-            PR_GIT_UPDATE=1
-            ;;
-        *svn*)
-            PR_GIT_UPDATE=1
-            ;;
-    esac
+steeef_preexec() {
+  case "$(history $HISTCMD)" in
+    *git*)PR_GIT_UPDATE=1
+          ;;
+    *svn*)PR_GIT_UPDATE=1
+          ;;
+  esac
 }
 
-function steeef_chpwd {
-    PR_GIT_UPDATE=1
+steeef_chpwd() {
+  PR_GIT_UPDATE=1
 }
 
-function prompt_steeef_precmd {
-    if [[ -n "$PR_GIT_UPDATE" ]] ; then
-        # check for untracked files or updated submodules, since vcs_info doesn't
-        if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
-            PR_GIT_UPDATE=1
-            FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
-        else
-            FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
-        fi
-        zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} "
-
-        vcs_info 'prompt'
-        PR_GIT_UPDATE=
+prompt_steeef_precmd() {
+  if [[ -n "$PR_GIT_UPDATE" ]] ; then
+    # check for untracked files or updated submodules, since vcs_info doesn't
+    if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
+      PR_GIT_UPDATE=1
+      FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
+    else
+      FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
     fi
+    zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} "
+
+    vcs_info 'prompt'
+    PR_GIT_UPDATE=
+  fi
 
-    PROMPT='
+  PROMPT='
 %{$purple%}%n${${reset_color}%} at %{$orange%}%m${${reset_color}%} in %{$limegreen%}%~${${reset_color}%} $vcs_info_msg_0_$(virtualenv_info)%{${reset_color}%}
 $ '
 }
 
-function prompt_steeef_setup {
-    #use extended color pallete if available
-    if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
-        turquoise="%F{81}"
-        orange="%F{166}"
-        purple="%F{135}"
-        hotpink="%F{161}"
-        limegreen="%F{118}"
-    else
-        turquoise="%F{cyan}"
-        orange="%F{yellow}"
-        purple="%F{magenta}"
-        hotpink="%F{red}"
-        limegreen="%F{green}"
-    fi
-
-    # enable VCS systems you use
-    zstyle ':vcs_info:*' enable git svn
-
-    # check-for-changes can be really slow.
-    # you should disable it, if you work with large repositories
-    zstyle ':vcs_info:*:prompt:*' check-for-changes true
-
-    # set formats
-    # %b - branchname
-    # %u - unstagedstr (see below)
-    # %c - stagedstr (see below)
-    # %a - action (e.g. rebase-i)
-    # %R - repository path
-    # %S - path in the repository
-    PR_RST="%f"
-    FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
-    FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
-    FMT_UNSTAGED="%{$orange%}●"
-    FMT_STAGED="%{$limegreen%}●"
-
-    zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
-    zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
-    zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
-    zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
-    zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
-
-    PR_GIT_UPDATE=1
-
-    autoload -Uz add-zsh-hook
-    autoload -Uz vcs_info
-    autoload -Uz colors && colors
-
-    add-zsh-hook preexec steeef_preexec
-    add-zsh-hook chpwd steeef_chpwd
-    add-zsh-hook precmd prompt_steeef_precmd
-    prompt_opts=(cr subst percent)
+prompt_steeef_setup() {
+  #use extended color pallete if available
+  if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
+    turquoise="%F{81}"
+    orange="%F{166}"
+    purple="%F{135}"
+    hotpink="%F{161}"
+    limegreen="%F{118}"
+  else
+    turquoise="%F{cyan}"
+    orange="%F{yellow}"
+    purple="%F{magenta}"
+    hotpink="%F{red}"
+    limegreen="%F{green}"
+  fi
+
+  # enable VCS systems you use
+  zstyle ':vcs_info:*' enable git svn
+
+  # check-for-changes can be really slow.
+  # you should disable it, if you work with large repositories
+  zstyle ':vcs_info:*:prompt:*' check-for-changes true
+
+  # set formats
+  # %b - branchname
+  # %u - unstagedstr (see below)
+  # %c - stagedstr (see below)
+  # %a - action (e.g. rebase-i)
+  # %R - repository path
+  # %S - path in the repository
+  PR_RST="%f"
+  FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+  FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
+  FMT_UNSTAGED="%{$orange%}●"
+  FMT_STAGED="%{$limegreen%}●"
+
+  zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
+  zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
+  zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
+  zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+  zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
+
+  PR_GIT_UPDATE=1
+
+  autoload -Uz add-zsh-hook
+  autoload -Uz vcs_info
+  autoload -Uz colors && colors
+
+  add-zsh-hook preexec steeef_preexec
+  add-zsh-hook chpwd steeef_chpwd
+  add-zsh-hook precmd prompt_steeef_precmd
+  prompt_opts=(cr subst percent)
 }
 
 prompt_steeef_setup "$@"