diff --git a/vimrc b/vimrc index a40a27f..f5a197f 100644 --- a/vimrc +++ b/vimrc @@ -45,7 +45,7 @@ Bundle 'searchfold.vim' Bundle 'godlygeek/tabular' Bundle 'kshenoy/vim-signature' "Bundle 'SirVer/ultisnips' -Bundle 'fmoralesc/vim-pad' +"Bundle 'fmoralesc/vim-pad' Bundle 'lukerandall/haskellmode-vim' Bundle 'bitc/vim-hdevtools' " Bundle 'Shougo/neocomplcache' diff --git a/zshrc b/zshrc index 1d1e626..8b4162d 100644 --- a/zshrc +++ b/zshrc @@ -5,7 +5,9 @@ [[ -s /usr/share/zsh/site-contrib/powerline.zsh ]] && . /usr/share/zsh/site-contrib/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