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

Merge remote-tracking branch 'robbyrussell/master'

Browse source
This commit is contained in:
JuanPablo 2011-08-31 11:56:31 -03:00
commit 0d271a1541
5 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/completion.zsh
View file

@ -59,7 +59,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
# ... unless we really want to. # ... unless we really want to.
zstyle '*' single-ignored show zstyle '*' single-ignored show
if [ "$DISABLE_COMPLETION_WAITING_DOTS" != "true" ]; then if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then
expand-or-complete-with-dots() { expand-or-complete-with-dots() {
echo -n "\e[31m......\e[0m" echo -n "\e[31m......\e[0m"
zle expand-or-complete zle expand-or-complete

5
lib/key-bindings.zsh
View file

@ -14,10 +14,15 @@ bindkey '^[[B' down-line-or-search
bindkey "^[[H" beginning-of-line bindkey "^[[H" beginning-of-line
bindkey "^[[1~" beginning-of-line bindkey "^[[1~" beginning-of-line
bindkey "^[OH" beginning-of-line
bindkey "^[[F" end-of-line bindkey "^[[F" end-of-line
bindkey "^[[4~" end-of-line bindkey "^[[4~" end-of-line
bindkey "^[OF" end-of-line
bindkey ' ' magic-space # also do history expansion on space bindkey ' ' magic-space # also do history expansion on space
bindkey "^[[1;5C" forward-word
bindkey "^[[1;5D" backward-word
bindkey '^[[Z' reverse-menu-complete bindkey '^[[Z' reverse-menu-complete
# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~ # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~

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

@ -29,6 +29,10 @@ alias glg='git log --stat --max-count=5'
compdef _git glg=git-log compdef _git glg=git-log
alias glgg='git log --graph --max-count=5' alias glgg='git log --graph --max-count=5'
compdef _git glgg=git-log compdef _git glgg=git-log
alias gss='git status -s'
compdef _git gss=git-status
alias ga='git add'
compdef _git ga=git-add
# 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'

11
plugins/lol/lol.plugin.zsh
View file

@ -8,19 +8,30 @@ alias rtfm='man'
alias visible='echo' alias visible='echo'
alias invisible='cat' alias invisible='cat'
alias moar='more' alias moar='more'
alias tldr='less'
alias alwayz='tail -f'
alias icanhas='mkdir' alias icanhas='mkdir'
alias gimmeh='touch'
alias donotwant='rm' alias donotwant='rm'
alias dowant='cp' alias dowant='cp'
alias gtfo='mv' alias gtfo='mv'
alias nowai='chmod'
alias hai='cd' alias hai='cd'
alias iz='ls'
alias plz='pwd' alias plz='pwd'
alias ihasbucket='df -h'
alias inur='locate' alias inur='locate'
alias iminurbase='finger'
alias btw='nice'
alias obtw='nohup'
alias nomz='ps -aux' alias nomz='ps -aux'
alias nomnom='killall' alias nomnom='killall'
alias byes='exit'
alias cya='reboot' alias cya='reboot'
alias kthxbai='halt' alias kthxbai='halt'

4
templates/zshrc.zsh-template
View file

@ -19,8 +19,8 @@ ZSH_THEME="robbyrussell"
# Uncomment following line if you want to disable autosetting terminal title. # Uncomment following line if you want to disable autosetting terminal title.
# DISABLE_AUTO_TITLE="true" # DISABLE_AUTO_TITLE="true"
# Uncomment following line if you want disable red dots displayed while waiting for completion # Uncomment following line if you want red dots to be displayed while waiting for completion
# DISABLE_COMPLETION_WAITING_DOTS="true" # COMPLETION_WAITING_DOTS="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)