diff options
| -rw-r--r-- | lib/aliases.zsh | 14 | ||||
| -rw-r--r-- | themes/cypher.zsh-theme | 2 | ||||
| -rw-r--r-- | themes/wezm.zsh-theme | 7 | ||||
| -rw-r--r-- | tools/check_for_upgrade.sh | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 6f6c614f7..304bafd27 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -2,8 +2,14 @@ alias pu='pushd' alias po='popd' alias sc='ruby script/console' -alias sd='ruby script/server --debugger' +alias sdb='ruby script/dbconsole' +alias ssd='ruby script/server --debugger' alias ss='thin --stats "/thin/stats" start' +alias sg='ruby script/generate' +alias sd='ruby script/destroy' +alias sp='ruby script/plugin' +alias ssp='ruby script/spec' +alias rdbm='rake db:migrate' alias mr='mate CHANGELOG app config db lib public script spec test' alias .='pwd' @@ -18,12 +24,17 @@ alias ss='sudo su -' alias g='git' alias gst='git status' alias gl='git pull' +alias gup='git fetch && git rebase' alias gp='git push' alias gd='git diff | mate' +alias gdv='git diff -w "$@" | vim -R -' alias gc='git commit -v' alias gca='git commit -v -a' alias gb='git branch' alias gba='git branch -a' +alias gdb='git branch -d' +alias gcount='git shortlog -sn' +alias gcp='git cherry-pick' alias history='fc -l 1' @@ -36,6 +47,7 @@ alias sl=ls # often screw this up alias sgem='sudo gem' alias rfind='find . -name *.rb | xargs grep -n' +alias afind='ack-grep -il' alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' diff --git a/themes/cypher.zsh-theme b/themes/cypher.zsh-theme index 36633da26..45df53d22 100644 --- a/themes/cypher.zsh-theme +++ b/themes/cypher.zsh-theme @@ -1,4 +1,4 @@ # Based on evan's prompt # Shows the exit status of the last command if non-zero # Uses "#" instead of "»" when running with elevated privileges -PROMPT="%m %B%F{red}::%b %B%F{green}%3~%(0?. . %F{red}%? )%F{red}%(0!.#.»)%b%F{white} " +PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . ${fg[red]}%? )%{${fg[blue]}%}»%{${reset_color}%} " diff --git a/themes/wezm.zsh-theme b/themes/wezm.zsh-theme new file mode 100644 index 000000000..1881343b0 --- /dev/null +++ b/themes/wezm.zsh-theme @@ -0,0 +1,7 @@ +PROMPT='$(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} ' +RPROMPT='%{$fg[green]%}%~%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index feb999aff..5c212b6fa 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -4,7 +4,7 @@ current_epoch=$(($(date +%s) / 60 / 60 / 24)) if [ -f ~/.zsh-update ] then - source ~/.zsh-update + . ~/.zsh-update epoch_diff=$(($current_epoch - $LAST_EPOCH)) if [ $epoch_diff -gt 6 ] then |