From d9f3bff1c53203fb43e3174f73d0f338cf5d7df0 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Mon, 23 Apr 2018 15:16:31 -0400
Subject: [PATCH] Update zshrc

Drop support for zsh_profile. Update zshrc to be cognizant of
urbint/meta. Define minimum config necessary.
---
 configs/shared/.zsh_profile | 83 -------------------------------------
 configs/shared/.zshrc       | 20 +++------
 2 files changed, 6 insertions(+), 97 deletions(-)
 delete mode 100644 configs/shared/.zsh_profile

diff --git a/configs/shared/.zsh_profile b/configs/shared/.zsh_profile
deleted file mode 100644
index 07bc14c9a..000000000
--- a/configs/shared/.zsh_profile
+++ /dev/null
@@ -1,83 +0,0 @@
-export PATH=$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/opt/fzf/bin:$HOME/n/bin:$HOME/.cargo/bin
-
-
-# export the path this repository
-export PC_SETTINGS_PATH=$HOME/pc_settings
-
-
-# use emacs bindings (default) for terminal input
-set -o emacs
-
-
-# Configure default editor
-command -v nvim >/dev/null && \
-    export EDITOR=nvim || \
-    export EDITOR=vim
-
-
-# iex and erl shared interactive shell history
-export ERL_AFLAGS="-kernel shell_history enabled"
-
-
-# drone env variables
-export DRONE_SERVER="https://ci.urbinternal.com"
-export DRONE_TOKEN=$(<"${PC_SETTINGS_PATH}/configs/secrets/drone_token.txt")
-
-
-source $HOME/pc_settings/aliases.sh
-source $HOME/pc_settings/functions/index.sh
-source $HOME/pc_settings/scripts/setup_keybindings.sh
-source $HOME/pc_settings/emacs/index.sh
-
-
-bindkey "^R" history-incremental-search-backward
-
-
-# export docker env variables
-# re-enable this line when using docker otherwise you will receive
-# a TLS error since docker-machine won't be running
-# eval "$(docker-machine env default)"
-
-# run cmatrix command for 3 seconds before exiting
-#. $HOME/pc_settings/.matrix_intro.sh
-
-# syntax highlighting for CLI; if not installed, run the following command
-# brew install zsh-syntax-highlighting
-source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
-# Regain control of CLI <C- mappings for vim keybindings
-# RE: http://superuser.com/questions/588846/cannot-get-vim-to-remap-ctrls-to-w
-stty -ixon
-
-
-# Allows FZF to search hidden files (excluding .git repository)
-export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -l -g ""'
-export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
-
-
-# CTRL-Y - Paste the selected branch(es) into the command line
-__bsel() {
-  local cmd="git branch -a | tr -d '* ' | sed 's/^remotes\/origin\///' | sort | uniq"
-  setopt localoptions pipefail 2> /dev/null
-  eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS" $(__fzfcmd) -m "$@" | while read item; do
-    echo -n "${(q)item} "
-  done
-  local ret=$?
-  echo
-  return $ret
-}
-
-fzf-branch-widget() {
-  LBUFFER="${LBUFFER}$(__bsel)"
-  local ret=$?
-  zle redisplay
-  typeset -f zle-line-init >/dev/null && zle zle-line-init
-  return $ret
-}
-zle     -N   fzf-branch-widget
-bindkey '^Y' fzf-branch-widget
-
-
-# Run Autojump at shell startup
-[[ $(brew --prefix)/etc/profile.d/autojump.sh ]] && \
-. $(brew --prefix)/etc/profile.d/autojump.sh
diff --git a/configs/shared/.zshrc b/configs/shared/.zshrc
index 6e658292c..370a9fa94 100644
--- a/configs/shared/.zshrc
+++ b/configs/shared/.zshrc
@@ -1,16 +1,8 @@
-export ZSH=${HOME}/.oh-my-zsh
+export META_DIR="${HOME}/urbint/meta"
+export ZSH="${HOME}/.oh-my-zsh"
 
-ZSH_THEME="refined"
-plugins=(tmux zsh-autosuggestions git git-extras github gitfast)
-source $ZSH/oh-my-zsh.sh
-source ~/.zsh_profile
+ZSH_THEME=refined
+plugins=(zsh-autosuggestions git git-extras github)
 
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-export N_PREFIX="$HOME/n"; [[ :$PATH: == *":$N_PREFIX/bin:"* ]] || PATH+=":$N_PREFIX/bin"  # Added by n-install (see http://git.io/n-install-repo).
-
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/Users/wpcarro/Downloads/google-cloud-sdk/path.zsh.inc' ]; then source '/Users/wpcarro/Downloads/google-cloud-sdk/path.zsh.inc'; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f '/Users/wpcarro/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then source '/Users/wpcarro/Downloads/google-cloud-sdk/completion.zsh.inc'; fi
+source "${ZSH}/oh-my-zsh.sh"
+source "${META_DIR}/urbint_101/scripts/setup"