1 files changed, 23 insertions, 47 deletions
diff --git a/bashrc b/bashrc
index 224d286..17d926d 100644
--- a/bashrc
+++ b/bashrc
@@ -4,56 +4,20 @@ export LANG="en_US.UTF-8"
 export LC_ALL="$LANG"
 export LC_CTYPE="$LANG"
 export PAGER="less"
-export TMPDIR="${HOME}/tmp"
 export TZ=America/Los_Angeles
-export GOPATH="${HOME}"
+export GOPATH="${HOME}/gocode"
+export GOROOT="${HOME}/gocode/"
 
-export PATH="${HOME}/bin:${HOME}/src/bin:/opt/twitter/bin:~/src/source/dist:/opt/twitter/opt/go/libexec/bin:${PATH}"
+export PATH="${GOPATH}/bin:${HOME}/bin:${HOME}/src/bin:/opt/twitter/bin:~/src/source/dist:/opt/twitter/opt/go/libexec/bin:/opt/twitter/rvm/bin:${PATH}"
 
 [ -z "$PS1" ] && return
 
 # prompts
 export PS1="\W % "
 
-# limits
-ulimit -S -c 0
-
-# Set up ssh-agent
-SSH_ENV="$HOME/.ssh/environment"
-
-function start_agent {
-  if [[ -f "${HOME}/.ssh/id_rsa" ]]; then
-    echo "Initializing new GPG agent..."
-    touch $SSH_ENV
-    chmod 600 "${SSH_ENV}"
-    /usr/bin/ssh-agent | sed 's/^echo/#echo/' >> "${SSH_ENV}"
-    . "${SSH_ENV}" > /dev/null
-    /usr/bin/ssh-add
-  fi
-}
-
-# Source SSH settings, if applicable
-if [ -f "${SSH_ENV}" ]; then
-  . "${SSH_ENV}" > /dev/null
-  kill -0 $SSH_AGENT_PID 2>/dev/null || {
-    start_agent
-  }
-else
-  start_agent
-fi
-
-# some aliases
-if [[ "${OSTYPE}" =~ "darwin" ]]; then
-  alias ls='ls -G'
-else
-  alias ls='ls --color'
-fi
-
-# editor
 alias e="$EDITOR"
 alias et="TERM=xterm-256color emacsclient -nw"
 
-# generic commands
 alias cp="cp -i"
 alias l="ls"
 alias la="ls -a"
@@ -62,15 +26,27 @@ alias lt="ls -lhtr"
 alias mv="mv -i"
 alias rm="rm -i"
 
-# tools
-alias gerp="grep --color=auto"
-alias grep="grep --color=auto"
-alias pjson="python -mjson.tool"
+alias utc="date -u"
+alias tmuxa="tmux new-session -A -s work"
+alias k="kubectl"
+alias camera-backup="pbackup --bucket fcuny-photos --project fcuny-backups --import-path /Volumes/a6000/DCIM/100MSDCF/"
 
-# git
 alias g="git"
 alias gclean="git clean -dfx"
-alias gst="git status"
 
-# local stuff
-[ -f "${HOME}/.bash_local" ] && source "${HOME}/.bash_local"
+alias docker-restart="docker-machine restart default"
+alias docker-source="eval $(docker-machine env default)"
+alias docker-what="dockerrestart && dockersource"
+
+alias gonest="ssh -K nest.smfc.twitter.com"
+alias goebnest="ssh -K eventbus@nest.smfc.twitter.com"
+alias gobknest="ssh -K bookkeeper@nest.smfc.twitter.com"
+
+[ -f "${HOME}/.tools-cache/setup-dottools-path.sh" ] && source "${HOME}/.tools-cache/setup-dottools-path.sh"
+[ -f "/opt/twitter/bin/virtualenvwrapper.sh" ] && source "/opt/twitter/bin/virtualenvwrapper.sh"
+
+export TRANSLATEAPIKEY="AIzaSyBaXNhc9M2JgJHCAdYqAafER773IwbidjI"
+
+source ~/google-cloud-sdk/path.bash.inc
+source ~/google-cloud-sdk/completion.bash.inc
+source /opt/twitter/rvm/scripts/rvm