summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-12-02 13:08:12 -0800
committerRobby Russell <robby@planetargon.com>2012-12-02 13:08:12 -0800
commit13998bb2cc12d11c16728e4b1db0d2a326ca6607 (patch)
treebe33357226ee8e01358762e66e4ac3961fd6a7f7 /themes
parentdfbafe6d58bf1463df393fd4478154be36a675aa (diff)
parentfcc8b19253136e0f8d18d8e830c60ec64c6cc3e0 (diff)
downloadzsh-13998bb2cc12d11c16728e4b1db0d2a326ca6607.tar.gz
zsh-13998bb2cc12d11c16728e4b1db0d2a326ca6607.tar.bz2
zsh-13998bb2cc12d11c16728e4b1db0d2a326ca6607.zip
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Diffstat (limited to 'themes')
-rw-r--r--themes/fishy.zsh-theme6
-rw-r--r--themes/jonathan.zsh-theme2
2 files changed, 7 insertions, 1 deletions
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index f9e506cae..e9f78a54e 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -1,7 +1,11 @@
# ZSH Theme emulating the Fish shell's default prompt.
+_fishy_collapsed_wd() {
+ echo $(pwd | perl -pe "s|^$HOME|~|g; s|/([^/])[^/]*(?=/)|/\$1|g")
+}
+
local user_color='green'; [ $UID -eq 0 ] && user_color='red'
-PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
+PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2f0c4b917..9f0f30271 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,3 +1,5 @@
+functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){}
+
function theme_precmd {
local TERMWIDTH
(( TERMWIDTH = ${COLUMNS} - 1 ))