mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-11 00:10:08 +00:00
Fixing merge
This commit is contained in:
commit
a75d0ba8d7
7 changed files with 37 additions and 14 deletions
|
@ -4,12 +4,17 @@
|
||||||
alias pu='pushd'
|
alias pu='pushd'
|
||||||
alias po='popd'
|
alias po='popd'
|
||||||
|
|
||||||
# Ruby related
|
|
||||||
alias ss='thin --stats "/thin/stats" start'
|
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'
|
||||||
|
|
||||||
# Basic directory operations
|
# Basic directory operations
|
||||||
alias .='pwd'
|
alias .='pwd'
|
||||||
alias ...='cd ../..'
|
alias ...='cd ../..'
|
||||||
|
alias -- -='cd -'
|
||||||
|
|
||||||
# Super user
|
# Super user
|
||||||
alias _='sudo'
|
alias _='sudo'
|
||||||
|
@ -21,12 +26,17 @@ alias ss='sudo su -'
|
||||||
alias g='git'
|
alias g='git'
|
||||||
alias gst='git status'
|
alias gst='git status'
|
||||||
alias gl='git pull'
|
alias gl='git pull'
|
||||||
|
alias gup='git fetch && git rebase'
|
||||||
alias gp='git push'
|
alias gp='git push'
|
||||||
alias gd='git diff | mate'
|
alias gd='git diff | mate'
|
||||||
|
alias gdv='git diff -w "$@" | vim -R -'
|
||||||
alias gc='git commit -v'
|
alias gc='git commit -v'
|
||||||
alias gca='git commit -v -a'
|
alias gca='git commit -v -a'
|
||||||
alias gb='git branch'
|
alias gb='git branch'
|
||||||
alias gba='git branch -a'
|
alias gba='git branch -a'
|
||||||
|
alias gdb='git branch -d'
|
||||||
|
alias gcount='git shortlog -sn'
|
||||||
|
alias gcp='git cherry-pick'
|
||||||
|
|
||||||
# Show history
|
# Show history
|
||||||
alias history='fc -l 1'
|
alias history='fc -l 1'
|
||||||
|
@ -41,6 +51,7 @@ alias sgem='sudo gem'
|
||||||
|
|
||||||
# Find ruby file
|
# Find ruby file
|
||||||
alias rfind='find . -name *.rb | xargs grep -n'
|
alias rfind='find . -name *.rb | xargs grep -n'
|
||||||
|
alias afind='ack-grep -il'
|
||||||
|
|
||||||
# Git and svn mix
|
# Git and svn mix
|
||||||
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
||||||
|
@ -59,5 +70,3 @@ alias sd='ruby script/server --debugger'
|
||||||
# Editor Ruby file in TextMate
|
# Editor Ruby file in TextMate
|
||||||
alias mr='mate CHANGELOG app config db lib public script spec test'
|
alias mr='mate CHANGELOG app config db lib public script spec test'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,11 +7,3 @@ bindkey "^[m" copy-prev-shell-word
|
||||||
|
|
||||||
## jobs
|
## jobs
|
||||||
setopt long_list_jobs
|
setopt long_list_jobs
|
||||||
|
|
||||||
# Check for updates on initial load...
|
|
||||||
if [ "$DISABLE_AUTO_UPDATE" = "true" ]
|
|
||||||
then
|
|
||||||
return
|
|
||||||
else
|
|
||||||
/bin/sh $ZSH/tools/check_for_upgrade.sh
|
|
||||||
fi
|
|
||||||
|
|
|
@ -7,5 +7,10 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
|
||||||
# Load all of your custom configurations from custom/
|
# Load all of your custom configurations from custom/
|
||||||
for config_file ($ZSH/custom/*.zsh) source $config_file
|
for config_file ($ZSH/custom/*.zsh) source $config_file
|
||||||
|
|
||||||
|
# Check for updates on initial load...
|
||||||
export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin
|
if [ "$DISABLE_AUTO_UPDATE" = "true" ]
|
||||||
|
then
|
||||||
|
return
|
||||||
|
else
|
||||||
|
/bin/sh $ZSH/tools/check_for_upgrade.sh
|
||||||
|
fi
|
||||||
|
|
4
themes/cypher.zsh-theme
Normal file
4
themes/cypher.zsh-theme
Normal file
|
@ -0,0 +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 %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . ${fg[red]}%? )%{${fg[blue]}%}»%{${reset_color}%} "
|
7
themes/wezm.zsh-theme
Normal file
7
themes/wezm.zsh-theme
Normal file
|
@ -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]%})"
|
6
themes/xiong-chiamiov.zsh-theme
Normal file
6
themes/xiong-chiamiov.zsh-theme
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
# user, host, full path, and time/date
|
||||||
|
# on two lines for easier vgrepping
|
||||||
|
# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
|
||||||
|
PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
|
||||||
|
%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]>%{\e[0m%}%b '
|
||||||
|
PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
|
|
@ -4,7 +4,7 @@ current_epoch=$(($(date +%s) / 60 / 60 / 24))
|
||||||
|
|
||||||
if [ -f ~/.zsh-update ]
|
if [ -f ~/.zsh-update ]
|
||||||
then
|
then
|
||||||
source ~/.zsh-update
|
. ~/.zsh-update
|
||||||
epoch_diff=$(($current_epoch - $LAST_EPOCH))
|
epoch_diff=$(($current_epoch - $LAST_EPOCH))
|
||||||
if [ $epoch_diff -gt 6 ]
|
if [ $epoch_diff -gt 6 ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in a new issue