jswank/dotfiles
1
0
Fork 0
Code Pull Requests Activity

remove control path for shared fs

Browse Source
This commit is contained in:
Jason Swank 2024-06-01 23:47:23 +00:00
parent 5ee17f3a81
commit 244d4c9526
No known key found for this signature in database
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssh/.ssh/config
View File

@ -1,5 +1,5 @@
ControlMaster auto ControlMaster auto
ControlPath ~/.ssh/%h:%p_%r # ControlPath ~/.ssh/%h:%p_%r
ServerAliveInterval 60 ServerAliveInterval 60
ForwardAgent yes ForwardAgent yes
NoHostAuthenticationForLocalhost yes NoHostAuthenticationForLocalhost yes

57
zsh/.zshrc
View File

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