diff --git a/zsh/zprofile b/zsh/zprofile old mode 100644 new mode 100755 diff --git a/zsh/zshrc b/zsh/zshrc index e16fd14..8bee31c 100755 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -146,13 +146,9 @@ alias mv='mv -i' alias tmux='tmux -2' alias mv_p='rsync --progress --remove-source-files -h' alias ls='ls --color=auto' -alias windows='sudo grub-reboot 2;sudo reboot' -alias youtube='quvi --exec "mplayer %u"' -alias poweroff='sudo poweroff' +alias poweroff='systemctl poweroff' alias xephyr-dualscreen='Xephyr -ac -br -noreset -screen 800x600 -screen 800x600 :1& sleep 3; DISPLAY=:1; setxkbmap fr bepo' alias xephyr-onescreen='Xephyr -ac -br -noreset -screen 800x600 :1& sleep 3; DISPLAY=:1; setxkbmap fr bepo' -alias reload="pkill -u `id -u` --signal USR1 zsh" -alias loadkeychain='eval $(/usr/bin/keychain --eval --agents ssh -Q --quiet ~/.ssh/id_rsa)' alias be='bundle exec' alias git-count="gawk '{ add += \$1 ; subs += \$2 ; loc += \$1 - \$2 } END { printf \"added lines: %s, removed lines : %s, total lines : %s\n\", add, subs, loc }\' -" @@ -197,6 +193,5 @@ function fake_git() { GIT_COMMITTER_DATE=$DATE git commit --date=$DATE "$@" } -trap "source ~/.zshrc && rehash" USR1 - -loadkeychain +source /usr/share/chruby/chruby.sh +source /usr/share/chruby/auto.sh