linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cf1799dc0e into 7004ac9ec4

Browse source
This commit is contained in:
J. Randall Hunt 2012-12-02 12:25:16 -08:00
commit 816347730b
3 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/git/git.plugin.zsh
View file

@ -69,9 +69,9 @@ function current_repository() {
}
# these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)'
alias ggpull='git pull origin --rebase $(current_branch)'
compdef ggpull=git
alias ggpush='git push origin $(current_branch)'
compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
alias ggpnp='git pull origin --rebase $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git

5
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -1,5 +1,8 @@
WRAPPER_FOUND=0
for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
for wrapsource in "/usr/bin/virtualenvwrapper_lazy.sh" \
"/usr/local/bin/virtualenvwrapper_lazy.sh" \
"/usr/local/share/python/virtualenvwrapper_lazy.sh" \
"/etc/bash_completion.d/virtualenvwrapper"; do
if [[ -e $wrapsource ]] ; then
WRAPPER_FOUND=1
source $wrapsource

25
themes/humza.zsh-theme
View file

@ -1,26 +1,5 @@
# ZSH THEME Preview: https://skitch.com/huyy/rk979/humza.zshtheme
let TotalBytes=0
for Bytes in $(ls -l | grep "^-" | awk '{ print $5 }')
do
let TotalBytes=$TotalBytes+$Bytes
done
# should it say b, kb, Mb, or Gb
if [ $TotalBytes -lt 1024 ]; then
TotalSize=$(echo -e "scale=3 \n$TotalBytes \nquit" | bc)
suffix="b"
elif [ $TotalBytes -lt 1048576 ]; then
TotalSize=$(echo -e "scale=3 \n$TotalBytes/1024 \nquit" | bc)
suffix="kb"
elif [ $TotalBytes -lt 1073741824 ]; then
TotalSize=$(echo -e "scale=3 \n$TotalBytes/1048576 \nquit" | bc)
suffix="Mb"
else
TotalSize=$(echo -e "scale=3 \n$TotalBytes/1073741824 \nquit" | bc)
suffix="Gb"
fi
PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) greetings, earthling %{$fg[green]%}[%{$reset_color%}%{$TotalSize%}%{$suffix%}%{$fg[green]%}]%{$fg[red]%}$%{$reset_color%} ☞ '
PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) %{$fg[red]%}$%{$reset_color%} ☞ '
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}±("
ZSH_THEME_GIT_PROMPT_SUFFIX=");%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"