Diff
1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
2index d2d3aed811f08191cab9c012de2284e4f32b8354..b47de5bde5a573e4c9465048111c133b3213edc3 100644
3--- a/lib/aliases.zsh
4+++ b/lib/aliases.zsh
5@@ -21,3 +21,5 @@ alias ll='ls -l'
6 alias sl=ls # often screw this up
7
8 alias afind='ack-grep -il'
9+
10+alias x=extract
11diff --git a/lib/appearance.zsh b/lib/appearance.zsh
12index ffee52b5e50a6e354d1adb5d94d877fe7ea3cb57..aec67721a8414ba3386b4d2a9f87306235e3eb16 100644
13--- a/lib/appearance.zsh
14+++ b/lib/appearance.zsh
15@@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c
16 # Setup the prompt with pretty colors
17 setopt prompt_subst
18
19-# Load the theme
20-source "$ZSH/themes/$ZSH_THEME.zsh-theme"
21diff --git a/lib/functions.zsh b/lib/functions.zsh
22index e3c0de43ed8852c672b877177898f27f52af2a02..914f2ef25a22d141cfd2e8c9c6255e535641274b 100644
23--- a/lib/functions.zsh
24+++ b/lib/functions.zsh
25@@ -37,3 +37,39 @@ function take() {
26 mkdir -p $1
27 cd $1
28 }
29+
30+function extract() {
31+ unset REMOVE_ARCHIVE
32+
33+ if test "$1" = "-r"; then
34+ REMOVE=1
35+ shift
36+ fi
37+ if [[ -f $1 ]]; then
38+ case $1 in
39+ *.tar.bz2) tar xvjf $1;;
40+ *.tar.gz) tar xvzf $1;;
41+ *.tar.xz) tar xvJf $1;;
42+ *.tar.lzma) tar --lzma -xvf $1;;
43+ *.bz2) bunzip $1;;
44+ *.rar) unrar $1;;
45+ *.gz) gunzip $1;;
46+ *.tar) tar xvf $1;;
47+ *.tbz2) tar xvjf $1;;
48+ *.tgz) tar xvzf $1;;
49+ *.zip) unzip $1;;
50+ *.Z) uncompress $1;;
51+ *.7z) 7z x $1;;
52+ *) echo "'$1' cannot be extracted via >extract<";;
53+ esac
54+
55+ if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
56+ echo removing "$1";
57+ /bin/rm "$1";
58+ fi
59+
60+ else
61+ echo "'$1' is not a valid file"
62+ fi
63+}
64+
65diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
66index 848e48eb5e7002391a4a352c8bd7828a09023998..291772dfe0b8bc5345717ef2b185eb7b52fa3194 100644
67--- a/oh-my-zsh.sh
68+++ b/oh-my-zsh.sh
69@@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
70 plugin=${plugin:=()}
71 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
72
73+# Load the theme
74+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
75+
76 # Check for updates on initial load...
77 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
78 then
79diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler.zsh-theme
80index 4eec8e827d98b1f5df8a780bfe03e3f87de25d18..e4bfb79c5fb742a903e77178025998188b5a15b1 100644
81--- a/themes/theunraveler.zsh-theme
82+++ b/themes/theunraveler.zsh-theme
83@@ -1,6 +1,16 @@
84-# Comment
85+# Comment
86
87-ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
88-ZSH_THEME_GIT_PROMPT_SUFFIX=')'
89+PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
90
91-PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
92+RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
93+
94+ZSH_THEME_GIT_PROMPT_PREFIX=""
95+ZSH_THEME_GIT_PROMPT_SUFFIX=""
96+ZSH_THEME_GIT_PROMPT_DIRTY=""
97+ZSH_THEME_GIT_PROMPT_CLEAN=""
98+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
99+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
100+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
101+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
102+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
103+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"