diff --git a/common/.zshrc b/common/.zshrc index f3256ec..88bf485 100644 --- a/common/.zshrc +++ b/common/.zshrc @@ -97,9 +97,9 @@ export PATH=$PATH:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/ ssc() { ssh -XC -p ${3:-"22"} -t ${2:-`whoami`}@$1 ${argv[4,-1]} } -senritsu() { ssc senritsu.kujiu.org ${argv[-1]:-`whoami`} 22 $argv[1,-2]; } +senritsu() { ssc senritsu.kujiu.org ${argv[-1]:-`whoami`} 22 $argv[1,-2]; } gon() { ssc gon.kujiu.org ${argv[-1]:-`whoami`} 2852 $argv[1,-2]; } -kirua() { ssc kirua.kujiu.org ${argv[-1]:-`whoami`} 2851 $argv[1,-2]; } +kirua() { ssc kirua.kujiu.org ${argv[-1]:-`whoami`} 22 $argv[1,-2]; } kurapika() { ssc kurapika.kujiu.org ${argv[-1]:-`whoami`} 2854 $argv[1,-2]; } leorio() { ssc leorio.kujiu.org ${argv[-1]:-`whoami`} 2853 $argv[1,-2]; } ellcrys() { ssc ellcrys.kujiu.org ${argv[-1]:-`whoami`} 22 $argv[1,-2]; } @@ -119,11 +119,11 @@ alias gittree='git log --graph' alias gitlstags='git describe --tags' alias gittag='git tag -a' alias gitw='git instaweb --httpd=webrick' -alias gitpull='git pull --stat --progress' -alias gitpr='git pull --stat --progress --rebase' -alias gitprst='git stash && git pull --stat --progress --rebase && git stash apply' -alias gitprp='git pull --stat --progress --rebase && git push' -alias gitprstp='git stash && git pull --stat --progress --rebase && git stash apply && git push' +alias gitpull='git pull --stat --progress && git submodule update' +alias gitpr='git pull --stat --progress --rebase && git submodule update' +alias gitprst='git stash && git pull --stat --progress --rebase && git submodule update && git stash apply' +alias gitprp='git pull --stat --progress --rebase && git submodule update && git push' +alias gitprst='git stash && git pull --stat --progress --rebase && git submodule update && git stash apply && git push' gitgrephistory(){ if [ $# = 1 ] ; then @@ -142,3 +142,7 @@ POWERLINE_DETECT_SSH="true" POWERLINE_FULL_CURRENT_PATH="true" set -o vi + +alias vcatfr="espeak -v mb/mb-fr1 -p30 -s 150 -f" +alias vcaten="espeak -v mb/mb-en1 -p30 -s 150 -f" +alias vcat="vcaten"