From 244d4c95260a7664383594bdbf51058813530d4b Mon Sep 17 00:00:00 2001
From: Jason Swank <632526+jswank@users.noreply.github.com>
Date: Sat, 1 Jun 2024 23:47:23 +0000
Subject: [PATCH] remove control path for shared fs

---
 ssh/.ssh/config |  2 +-
 zsh/.zshrc      | 57 +++++++++++++++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 83e3712..f3bd660 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1,5 +1,5 @@
 ControlMaster auto
-ControlPath ~/.ssh/%h:%p_%r
+# ControlPath ~/.ssh/%h:%p_%r
 ServerAliveInterval 60
 ForwardAgent yes
 NoHostAuthenticationForLocalhost yes
diff --git a/zsh/.zshrc b/zsh/.zshrc
index dc5e926..4184ecf 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -5,6 +5,11 @@ alias vim='nvim'
 alias vi='nvim'
 alias w3='w3m -T text/html'
 
+path+=(~/bin)
+path+=(~/.local/bin)
+path+=($GOPATH/bin)
+export PATH
+
 # allow for # to be interpreted as a comment on the command line
 setopt interactivecomments
 
@@ -26,12 +31,12 @@ case $TERM in
     ;;
 esac
 
-if [ -n "$SSH_AUTH_SOCK" ]; then
-  if [ "$SSH_AUTH_SOCK" != ~/.ssh/ssh_auth_sock ]; then
-    ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
-    export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
-  fi
-fi
+#if [ -n "$SSH_AUTH_SOCK" ]; then
+#  if [ "$SSH_AUTH_SOCK" != $HOME/.ssh/ssh_auth_sock ]; then
+#    ln -sf $SSH_AUTH_SOCK $HOME/.ssh/ssh_auth_sock
+#    export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
+#  fi
+#fi
 
 if [ -e /usr/bin/keychain ]; then
   eval $(/usr/bin/keychain --eval --agents ssh -Q --quiet id_ed25519)
@@ -40,15 +45,30 @@ fi
 # direnv setup
 whence -p direnv &>/dev/null && eval "$(direnv hook zsh)"
 
+# setup CFA environment
+if [ -e $HOME/cfa-work/.zshrc ]; then
+  . $HOME/cfa-work/.zshrc
+fi
+
+# setup okta-aws-cli env
+# export $(xargs < $HOME/.okta/.env)
+
+# setup aws-cli env
+export $(xargs < $HOME/.aws/.env)
+
+# setup gh env
+export $(xargs < $HOME/.config/git/.env)
+
+autoload bashcompinit && bashcompinit
+autoload -Uz compinit
+compinit
+
+# kubectl
+[[ $commands[kubectl] ]] && source <(kubectl completion zsh)
+
 # Highlight the current autocomplete option
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 
-# asdf setup
-if [ -e $HOME/.asdf/asdf.sh ]; then
-  . "$HOME/.asdf/asdf.sh"
-  fpath=(${ASDF_DIR}/completions $fpath)
-fi
-
 # git branch prompt
 setopt prompt_subst
 autoload -Uz vcs_info
@@ -57,7 +77,6 @@ zstyle ':vcs_info:*' actionformats \
 zstyle ':vcs_info:*' formats       \
     '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{5}]%f '
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
-
 zstyle ':vcs_info:*' enable git cvs svn
 
 
@@ -83,14 +102,10 @@ if [[ $#h -gt 0 ]]; then
 fi
 
 zstyle :compinstall filename '~/.zshrc'
-autoload -Uz compinit
-compinit
-
-# The following lines were added by compinstall
+complete -C '/usr/bin/aws_completer' aws
 
 #zstyle ':completion:*' completer _complete _ignored
 #zstyle :compinstall filename '~/.zshrc'
-#
-#autoload -Uz compinit
-#compinit
-# End of lines added by compinstall
+
+autoload -U +X bashcompinit && bashcompinit
+complete -o nospace -C /home/cli/.local/bin/terraform terraform