summaryrefslogtreecommitdiff
path: root/plugins/lol
diff options
context:
space:
mode:
authorTristan Carel <tcarel@exalead.com>2011-10-10 14:58:28 +0200
committerTristan Carel <tcarel@exalead.com>2011-10-10 14:58:28 +0200
commitdb90589c8a02e98e657af17bb0b460b752d9ed61 (patch)
treed1354a9338bf9921ad0f66d2f5394272e1cfec77 /plugins/lol
parent7066bf7c6b522af9147ebf03c00361c4c6490d42 (diff)
parent57f04b921ea1c12a0a283331778848cd4011bf21 (diff)
downloadzsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.gz
zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.bz2
zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.zip
Merge remote-tracking branch 'upstream/master' into emacs
Conflicts: plugins/emacs/emacs.plugin.zsh plugins/emacs/emacsclient.sh
Diffstat (limited to 'plugins/lol')
-rw-r--r--plugins/lol/lol.plugin.zsh11
1 files changed, 11 insertions, 0 deletions
diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index a7153bb57..e455527e7 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -8,19 +8,30 @@ alias rtfm='man'
alias visible='echo'
alias invisible='cat'
alias moar='more'
+alias tldr='less'
+alias alwayz='tail -f'
alias icanhas='mkdir'
+alias gimmeh='touch'
alias donotwant='rm'
alias dowant='cp'
alias gtfo='mv'
+alias nowai='chmod'
alias hai='cd'
+alias iz='ls'
alias plz='pwd'
+alias ihasbucket='df -h'
alias inur='locate'
+alias iminurbase='finger'
+
+alias btw='nice'
+alias obtw='nohup'
alias nomz='ps -aux'
alias nomnom='killall'
+alias byes='exit'
alias cya='reboot'
alias kthxbai='halt'