update

1 files changed, 3 insertions, 84 deletions

diff --git a/modules/zsh/themes/simple.zsh-theme b/modules/zsh/themes/simple.zsh-theme
index dc9a201..135eed0 100644
--- a/modules/zsh/themes/simple.zsh-theme
+++ b/modules/zsh/themes/simple.zsh-theme
@@ -2,91 +2,10 @@ function virtualenv_info {
   [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
 }
 
-function gitstatus_prompt_update() {
-  typeset -g GITSTATUS_PROMPT=''
-  local p
-
-  gitstatus_query 'MY' || return 1 # we could use -c to do async
-  [[ $VCS_STATUS_RESULT == 'ok-sync' ]] || return 0 # not in a repo
-
-
-  local green='%{%F{green}%}'
-  local red='%{%F{red}%}'
-  local yellow='%{%F{yellow}%}'
-  local blue='%{%F{blue}%}'
-
-  local name
-  if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then
-    name=$VCS_STATUS_LOCAL_BRANCH
-  elif [[ -n $VCS_STATUS_TAG ]]; then 
-    p+='%f#'
-    name="${VCS_STATUS_TAG}"
-  else
-    p+='%f@'
-    name="#${VCS_STATUS_COMMIT[1,8]}"
-  fi
-
-  (( $#name > 32 )) && name[13,-13]="…"  # truncate long branch names and tags
-  p+="${green}${name//\%/%%}"            # escape %
-
-   # ⇣42 if behind the remote.
-  (( VCS_STATUS_COMMITS_BEHIND )) && p+=" ${green}⇣${VCS_STATUS_COMMITS_BEHIND}"
-  # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
-  (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && p+=" "
-  (( VCS_STATUS_COMMITS_AHEAD  )) && p+="${green}⇡${VCS_STATUS_COMMITS_AHEAD}"
-  # ⇠42 if behind the push remote.
-  (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" ${green}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}"
-  (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" "
-  # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42.
-  (( VCS_STATUS_PUSH_COMMITS_AHEAD  )) && p+="${green}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}"
-  # *42 if have stashes.
-  (( VCS_STATUS_STASHES        )) && p+=" ${green}*${VCS_STATUS_STASHES}"
-  # 'merge' if the repo is in an unusual state.
-  [[ -n $VCS_STATUS_ACTION     ]] && p+=" ${red}${VCS_STATUS_ACTION}"
-  # ~42 if have merge conflicts.
-  (( VCS_STATUS_NUM_CONFLICTED )) && p+=" ${red}~${VCS_STATUS_NUM_CONFLICTED}"
-  # +42 if have staged changes.
-  (( VCS_STATUS_NUM_STAGED     )) && p+=" ${yellow}+${VCS_STATUS_NUM_STAGED}"
-  # !42 if have unstaged changes.
-  (( VCS_STATUS_NUM_UNSTAGED   )) && p+=" ${yellow}!${VCS_STATUS_NUM_UNSTAGED}"
-  # ?42 if have untracked files. It's really a question mark, your font isn't broken.
-  (( VCS_STATUS_NUM_UNTRACKED  )) && p+=" ${blue}?${VCS_STATUS_NUM_UNTRACKED}"
-
-  GITSTATUS_PROMPT="%f${p}%f"
-}
-
-INS_MODE='%{%F{reset}%}[%{%F{green}%}i%{%F{reset}%}]'
-NORMAL_MODE='%{%F{reset}%}[%{%F{yellow}%}n%{%F{reset}%}]'
-VI_MODE=$INS_MODE
-
-function zle-keymap-select() {
-  VI_MODE="${${KEYMAP/vicmd/${NORMAL_MODE}}/(main|viins)/${INS_MODE}}"
-  zle reset-prompt
-#  zle -R
-}
-
-zle -N zle-keymap-select # hook readline so we can determine mode
-
-# normally, SIGINT (<C-c>) will put you in ins, but indictator wont update.
-# fix: hook TRAPINT, update mode and repropagate the SIGINT
-# im too lazy to figure out if its possible to keep normal mode and send a sigint
-TRAPINT() {
-    export VI_MODE=$INS_MODE
-    return $((128+$1))
-}
-
-source "$(gitstatus-share)/gitstatus.plugin.zsh" || return
-
-gitstatus_stop 'MY' && gitstatus_start -s -1 -u -1 -c -1 -d -1 'MY'
-
-autoload -Uz add-zsh-hook
-add-zsh-hook precmd gitstatus_prompt_update
+# autoload -Uz add-zsh-hook
 
 setopt prompt_subst prompt_percent no_prompt_bang
 
 NEWLINE=$'\n'
-GIT_PROMPT_INFO=${GITSTATUS_PROMPT:+ $GITSTATUS_PROMPT}
-PROMPT='%F{magenta}%~% %f%  ${VI_MODE}${NEWLINE}%{%F{yellow}%}λ %b%f% '
-RPROMPT='$(virtualenv_info)% ${GITSTATUS_PROMPT:+ $GITSTATUS_PROMPT} '
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+PROMPT='%~% %f%  ${NEWLINE}λ %b%f% '
+RPROMPT='$(virtualenv_info)% '