aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdeploy.sh3
-rw-r--r--oh-my-zsh/svn.zsh16
-rw-r--r--oh-my-zsh/xcolour.zsh-theme21
3 files changed, 40 insertions, 0 deletions
diff --git a/deploy.sh b/deploy.sh
index 2c0bdf8..4f55677 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,6 +16,9 @@ do
cp $f ~/.${f}
done
+cp oh-my-zsh/svn.zsh ~/.oh-my-zsh/lib/svn.zsh
+cp oh-my-zsh/xcolour.zsh-theme ~/.oh-my-zsh/themes/xcolour.zsh-theme
+
mkdir -p ~/.vim
cp -r vim/* ~/.vim
diff --git a/oh-my-zsh/svn.zsh b/oh-my-zsh/svn.zsh
new file mode 100644
index 0000000..54d23b4
--- /dev/null
+++ b/oh-my-zsh/svn.zsh
@@ -0,0 +1,16 @@
+# utility functions for subversion
+# based on oh-my-zsh git lib module
+
+function svn_dirty {
+ if [[ -n $(svn status) ]]; then
+ echo "$ZSH_THEME_SVN_PROMPT_DIRTY"
+ else
+ echo "$ZSH_THEME_SVN_PROMPT_CLEAN"
+ fi
+}
+
+function svn_prompt_info {
+ info=$(svn info 2>/dev/null) || return
+ rev=$(echo "$info" | grep Revision | sed 's/Revision: //')
+ echo "${ZSH_THEME_GIT_PROMPT_PREFIX}r${rev}$(svn_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+}
diff --git a/oh-my-zsh/xcolour.zsh-theme b/oh-my-zsh/xcolour.zsh-theme
new file mode 100644
index 0000000..13e36e3
--- /dev/null
+++ b/oh-my-zsh/xcolour.zsh-theme
@@ -0,0 +1,21 @@
+# Matt Singleton's oh-my-zsh theme
+
+function prompt_char {
+ git branch >/dev/null 2>/dev/null && echo '±' && return
+ svn info >/dev/null 2>/dev/null && echo 'ϟ' && return
+ echo '$'
+}
+
+PROMPT='%{$fg[yellow]%}%n%{$reset_color%}@%{$fg[green]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}
+$(git_prompt_info)$(svn_prompt_info)$(prompt_char) %{$reset_color%}'
+RPROMPT='%D{%r}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=") "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}✘%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}✔%{$reset_color%}"
+
+ZSH_THEME_SVN_PROMPT_PREFIX="("
+ZSH_THEME_SVN_PROMPT_SUFFIX=") "
+ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%}✘%{$reset_color%}"
+ZSH_THEME_SVN_PROMPT_CLEAN="%{$fg[green]%}✔%{$reset_color%}"