diff --git a/zshrc b/zshrc index 3acb033..d850bf5 100644 --- a/zshrc +++ b/zshrc @@ -1,8 +1,11 @@ # Powerline # Mac -[[ -s /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh +#[[ -s /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh # Linux -[[ -s /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh +#[[ -s /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh + +# Nix +. /Users/dustinswan/.nix-profile/etc/profile.d/nix.sh bindkey -e @@ -19,9 +22,6 @@ export MOSH_TITLE_NOPREFIX=1 export BROWSER=open [[ -s luakit ]] && export BROWSER=luakit -#alias browser='open -a Firefox.app' -#[[ -s luakit ]] && alias browser='luakit' - # IOCOM stuff export P4USER=dswan export P4PORT="humu.insors.net:1666" @@ -30,35 +30,32 @@ export P4EDITOR=vim alias p4vimdiff "set -x P4DIFF vimdiff; p4 diff" alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'; scp /opt/iocom/user/webclient/all_desktop.js root@visidev.iocom.com:/opt/iocom/user/webclient/; scp /opt/iocom/user/webclient/css/all_desktop.css root@visidev.iocom.com:/opt/iocom/user/webclient/css/" alias dswan="ssh root@dswan.insors.net" -alias webdev='ssh -t root@webdev.insors.net "cd /var/www/html; /bin/bash -i"' -alias er='rm -rf logs; unzip -o -P qt' +alias er='rm -rf logs; unzip -o -P' export PATH=/usr/local/bin:/usr/local/sbin:$PATH # Homebrew -export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH # Postgres +export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH export PATH=/usr/local/share/python:$PATH -export PATH=$HOME/Library/Haskell/bin:$PATH # Haskell -export PATH=$HOME/dotfiles/bin:$PATH # Dotfiles bin -export PATH=/usr/local/share/npm/bin:$PATH # npm +export PATH=$HOME/Library/Haskell/bin:$PATH +export PATH=~/.cabal/bin:$PATH +export PATH=$HOME/dotfiles/bin:$PATH +export PATH=/usr/local/share/npm/bin:$PATH export NODE_PATH=/usr/local/lib/node:/usr/local/share/npm/lib/node_modules export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt # Chruby -if [[ -e /usr/local/share/chruby ]]; then - source /usr/local/share/chruby/chruby.sh - source /usr/local/share/chruby/auto.sh - chruby $(cat ~/.ruby-version) -fi -if [[ -e /usr/share/chruby ]]; then - source /usr/share/chruby/chruby.sh - source /usr/share/chruby/auto.sh - chruby $(cat ~/.ruby-version) -fi +source /usr/local/share/chruby/chruby.sh +source /usr/local/share/chruby/auto.sh +#chruby $(cat ~/.ruby-version) -eval `keychain --eval id_rsa` +# NVM +export NVM_DIR=~/.nvm +source $(brew --prefix nvm)/nvm.sh -#autoload predict-on -#predict-on +autoload predict-on +predict-on + +eval `keychain --eval id_rsa` HISTSIZE=1000 SAVEHIST=1000