Merge branch 'master' of github.com:dustinswan/dotfiles

11 years ago · b0672e9c30
parent 1f1330a688 413ac080e1
commit b0672e9c30
1 changed files with 5 additions and 0 deletions
--- a/5
+++ b/5
@ -5,7 +5,9 @@
 [[ -s /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh

 alias vi=vim
+alias l="ls -l"
 alias tmux="tmux -2"
+alias dustinswan="ssh dustinswan@dustinswan.org"
 export EDITOR=vim

 export BROWSER=open
@ -42,3 +44,6 @@ if [[ -e /usr/share/chruby ]]; then
    source /usr/share/chruby/auto.sh
 fi
 chruby $(cat ~/.ruby-version)
+
+# GPG
+~/dotfiles/bin/gpg-agent.sh