From 93cfed0e111897ae5e26df4fa3187dd21e576daf Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 13:58:53 +0100 Subject: [PATCH 1/7] Add in my normal s{s,d} aliases --- aliases.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases.zsh b/aliases.zsh index 5cf253dc..4c079c1e 100644 --- a/aliases.zsh +++ b/aliases.zsh @@ -2,7 +2,8 @@ alias pu='pushd' alias po='popd' alias sc='ruby script/console' -alias ss='ruby script/server' +alias sd='ruby script/server --debugger' +alias ss='thin --stats "/thin/stats" start' alias mr='mate CHANGELOG app config db lib public script spec test' alias .='pwd' From 0196e5ed6d75a3c740902642fb64ac30621885d4 Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 13:59:16 +0100 Subject: [PATCH 2/7] Add textmate aliases --- aliases.zsh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/aliases.zsh b/aliases.zsh index 4c079c1e..cabeca60 100644 --- a/aliases.zsh +++ b/aliases.zsh @@ -27,4 +27,9 @@ alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' bindkey '\ew' kill-region bindkey -s '\el' "ls\n" -bindkey -s '\e.' "..\n" \ No newline at end of file +bindkey -s '\e.' "..\n" + +alias et='mate . &' +alias ett='mate app config lib db public spec test Rakefile Capfile Todo &' +alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' +alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' From 1f82cfc85a3a68435846f8ec13094be267d8bff8 Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 13:59:34 +0100 Subject: [PATCH 3/7] Swap out g alias to git --- aliases.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases.zsh b/aliases.zsh index cabeca60..9bbeb068 100644 --- a/aliases.zsh +++ b/aliases.zsh @@ -11,7 +11,8 @@ alias ...='cd ../..' alias _='sudo' -alias g='grep -in' +#alias g='grep -in' +alias g='git' alias history='fc -l 1' From be966214c9be7fbcc3083f7be3094b87bf2acf70 Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 14:01:39 +0100 Subject: [PATCH 4/7] Strip colours from git.zsh --- git.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.zsh b/git.zsh index b9a86173..7f5714f7 100644 --- a/git.zsh +++ b/git.zsh @@ -4,7 +4,7 @@ function git_prompt_info() { branch=${ref#refs/heads/} if [[ -d .git ]]; then - CURRENT_BRANCH="%{$fg[red]%}git:(%{$fg[green]${branch}%{$fg[red])" + CURRENT_BRANCH="(${branch})" else CURRENT_BRANCH='' fi From 4e3f4d5e9fc3c7ea04fa507729c7d83acc1e372e Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 14:02:19 +0100 Subject: [PATCH 5/7] Use my normal PATH instead of included --- zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zshrc b/zshrc index 46f0b1b5..d5c00d6d 100644 --- a/zshrc +++ b/zshrc @@ -6,6 +6,6 @@ export ZSH=$HOME/.oh-my-zsh for i in $ZSH/*zsh; do source $i; done; # Customize to your needs... -export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin - +#export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin +export PATH=$PATH:$HOME/bin From b2f26ab8545197e929538539acbedba999e11ff7 Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 14:03:33 +0100 Subject: [PATCH 6/7] Customise prompt value --- prompt.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prompt.zsh b/prompt.zsh index 09481ded..d191af7f 100644 --- a/prompt.zsh +++ b/prompt.zsh @@ -29,4 +29,5 @@ setopt prompt_subst export LSCOLORS="Gxfxcxdxbxegedabagacad" -PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +# PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +PROMPT='%m:%1/$(git_prompt_info) %n\$ ' From 0678055f66faaeebfabcfe58aeb67059410df790 Mon Sep 17 00:00:00 2001 From: Geoff Garside Date: Mon, 31 Aug 2009 14:03:56 +0100 Subject: [PATCH 7/7] Add tab, take and tm functions --- functions.zsh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/functions.zsh b/functions.zsh index dcabed95..0dcfbd39 100644 --- a/functions.zsh +++ b/functions.zsh @@ -22,4 +22,26 @@ function preexec { function remote_console() { /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )" -} \ No newline at end of file +} + +function tab() { + osascript 2>/dev/null <