Diff
1diff --git a/aliases.zsh b/aliases.zsh
2index 5cf253dc5ca705487d2f14ddb8d34fe09c5e7778..e27cd036670aaa26a8f02955c7780828a1ae21eb 100644
3--- a/aliases.zsh
4+++ b/aliases.zsh
5@@ -2,7 +2,8 @@ alias pu='pushd'
6 alias po='popd'
7
8 alias sc='ruby script/console'
9-alias ss='ruby script/server'
10+alias sd='ruby script/server --debugger'
11+alias ss='thin --stats "/thin/stats" start'
12
13 alias mr='mate CHANGELOG app config db lib public script spec test'
14 alias .='pwd'
15@@ -10,11 +11,12 @@ alias ...='cd ../..'
16
17 alias _='sudo'
18
19-alias g='grep -in'
20+#alias g='grep -in'
21+alias g='git'
22
23 alias history='fc -l 1'
24
25-alias ls='ls -GF'
26+alias ls='ls -F'
27 alias ll='ls -al'
28
29 alias sgem='sudo gem'
30@@ -26,4 +28,12 @@ alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
31 bindkey '\ew' kill-region
32
33 bindkey -s '\el' "ls\n"
34-bindkey -s '\e.' "..\n"
35+bindkey -s '\e.' "..\n"
36+
37+alias et='mate . &'
38+alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
39+alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
40+alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
41+
42+bindkey "^[[A" history-beginning-search-backward
43+bindkey "^[[B" history-beginning-search-forward
44diff --git a/functions.zsh b/functions.zsh
45index 2ce91c964bf40e59e844916c9a54c7bf56a797b0..d0c24e9e9e4c04ba555bfc711649ac3fa27815f6 100644
46--- a/functions.zsh
47+++ b/functions.zsh
48@@ -30,4 +30,26 @@ function zsh_stats() {
49
50 function uninstall_oh_my_zsh() {
51 /bin/sh $ZSH/tools/uninstall.sh
52-}
53+}
54+
55+function tab() {
56+ osascript 2>/dev/null <<EOF
57+ tell application "System Events"
58+ tell process "Terminal" to keystroke "t" using command down
59+ end
60+ tell application "Terminal"
61+ activate
62+ do script with command "cd $PWD; $*" in window 1
63+ end tell
64+EOF
65+}
66+
67+function take() {
68+ mkdir -p $1
69+ cd $1
70+}
71+
72+function tm() {
73+ cd $1
74+ mate $1
75+}
76diff --git a/git.zsh b/git.zsh
77index 567c2faa263a8a09cf59186d37169c62cecfe3eb..b8fd1f08e2b2d3f20cde92ccf0740dde8a7dcd4c 100644
78--- a/git.zsh
79+++ b/git.zsh
80@@ -3,7 +3,7 @@ function git_prompt_info() {
81 if [[ -d .git ]]; then
82 ref=$(git symbolic-ref HEAD 2> /dev/null) || return
83 branch=${ref#refs/heads/}
84- CURRENT_BRANCH="%{$fg[red]%}git:(%{$fg[green]${branch}%{$fg[red])"
85+ CURRENT_BRANCH="git:(%{$fg[red]%}${branch}%{$fg[blue]%})%{$reset_color%}$(parse_git_dirty)"
86 else
87 CURRENT_BRANCH=''
88 fi
89@@ -12,5 +12,5 @@ function git_prompt_info() {
90 }
91
92 parse_git_dirty () {
93- [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "%{$fg[white] ♻ "
94+ [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo " %{$fg[yellow]%}✗%{$reset_color%}"
95 }
96diff --git a/prompt.zsh b/prompt.zsh
97index d6c35a6528bd6f39f70addb0c18880f1bbd2fd78..31c33feb5e56d0fd89830a862226481afab803d5 100644
98--- a/prompt.zsh
99+++ b/prompt.zsh
100@@ -29,4 +29,4 @@ setopt prompt_subst
101
102 export LSCOLORS="Gxfxcxdxbxegedabagacad"
103
104-source "$ZSH/themes/$ZSH_THEME.zsh-theme"
105+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
106diff --git a/themes/geoffgarside.zsh-theme b/themes/geoffgarside.zsh-theme
107new file mode 100644
108index 0000000000000000000000000000000000000000..38733d95c2666f1de270abf1cd6901d10271c963
109--- /dev/null
110+++ b/themes/geoffgarside.zsh-theme
111@@ -0,0 +1,2 @@
112+# PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) "
113+PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
114diff --git a/zshrc b/zshrc
115index e2f5fbad64e5031f11cc42f37f762c7b1abe79e3..39e2406f7de52d06003f152ccc17aa3ee72146fe 100644
116--- a/zshrc
117+++ b/zshrc
118@@ -4,12 +4,12 @@ export ZSH=$HOME/.oh-my-zsh
119 # Set to the name theme to load.
120 # Look in ~/.oh-my-zsh/themes/
121 export ZSH_THEME="robbyrussell"
122+# export ZSH_THEME="geoffgarside"
123
124 # Load all of the config files in ~/oh-my-zsh that end in .zsh
125 # TIP: Add files you don't want in git to .gitignore
126 for i in $ZSH/*zsh; do source $i; done;
127
128 # Customize to your needs...
129-export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin
130-
131+#export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin
132