Updates w/new configs

[rbdr/dotfiles] / ben-prose.zsh-theme

diff --git a/ben-prose.zsh-theme b/ben-prose.zsh-theme
index b6825ac9a66eb74eeca82f392bd7c804ffed0db1..dc21546404bf72d420faf8eb5cde8d3f11db13de 100644 (file)
--- a/ben-prose.zsh-theme
+++ b/ben-prose.zsh-theme
@@ -6,20 +6,21 @@ function rvm_info {
   echo '('`rvm-prompt`') '
 }
 
   echo '('`rvm-prompt`') '
 }
 

-function hg_prompt_info {
-    $OH_MY_ZSH_HG prompt --angle-brackets "\
-< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
-< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
-%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
-patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
-}
-

 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 
 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 

+function zle-line-init zle-keymap-select {
+    local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}"
+    RPS1="${${KEYMAP/vicmd/-- NORMAL --}/(main|viins)/-- INSERT --}${return_status}%{$reset_color%}"
+    RPS2=$RPS1
+    zle reset-prompt
+}
+zle -N zle-line-init
+zle -N zle-keymap-select
+

 PROMPT='
 PROMPT='

-%{$fg[red]%}%n%{$reset_color%} at %{$fg[yellow]%}$(box_name)%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info) %{$fg[black]%}$(rvm_info)%{$reset_color%}
+%{$fg[red]%}%n%{$reset_color%} at %{$fg[yellow]%}$(box_name)%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) %{$fg[black]%}$(rvm_info)%{$reset_color%}

 %(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[blue]%}"
 %(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[blue]%}"


@@ -28,5 +29,3 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 

-local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}"
-RPROMPT='${return_status}%{$reset_color%}'