Merge branch 'main' of ssh://git.scalene.net:22023/jswank/dotfiles

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "nvim/.config/nvim/pack/bundle/start/fzf-lua"]
 	path = nvim/.config/nvim/pack/bundle/start/fzf-lua
 	url = https://github.com/ibhagwan/fzf-lua.git
+[submodule "nvim/.config/nvim/pack/github/start/copilot.vim"]
+	path = nvim/.config/nvim/pack/github/start/copilot.vim
+	url = https://github.com/github/copilot.vim

nvim/.config/nvim/init.vim

@@ -67,6 +67,16 @@ nnoremap <c-p> <cmd>lua require('fzf-lua').files()<CR>
 nnoremap <c-\> <cmd>lua require('fzf-lua').buffers()<CR>
 nnoremap <c-g> <cmd>lua require('fzf-lua').grep()<CR>
 
+"
+" Github Copilot
+"
+" disable Copilot for now
+let g:copilot_enabled = 0
+" map key to enable copilot
+nmap <leader>cp :let g:copilot_enabled = 1<CR>
+
+" format any yaml file
+" autocmd BufWritePre *.yaml :%!yq -i %
 
 "
 " GO stuff

nvim/.config/nvim/pack/github/start/copilot.vim

@@ -0,0 +1 @@
+Subproject commit dfa657c80c915a6a3eb6d9010046a0576ad25a37

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

tmux/.config/tmux/tmux.conf

@@ -13,7 +13,7 @@ bind Escape copy-mode
 #bind-key -t vi-copy 'y' copy-selection
 
 # remove SSH_AUTH_SOCK from update-environment, otherwise setting it specifically doesn't work
-set-option -g update-environment "DISPLAY LANG LC_ALL SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
+set-option -g update-environment "PATH DISPLAY LANG LC_ALL SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
 
 set-environment -g SSH_AUTH_SOCK $HOME/.ssh/ssh_auth_sock
 

zsh/.zshrc

@@ -59,12 +59,12 @@ precmd_functions+=( set_prompt )
 # Configure SSH auth sock
 #
 
-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
 
 # setup SSH keys
 if [ -e /usr/bin/keychain ]; then
@@ -74,6 +74,27 @@ 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}"
 
@@ -90,5 +111,14 @@ if [[ $#h -gt 0 ]]; then
 fi
 
 zstyle :compinstall filename '~/.zshrc'
+
+if [[ -x /usr/bin/aws_completer ]]; then
+  complete -C '/usr/bin/aws_completer' aws
+fi
+
+#zstyle ':completion:*' completer _complete _ignored
+#zstyle :compinstall filename '~/.zshrc'
+
+autoload -U +X bashcompinit && bashcompinit
 autoload -Uz compinit
 compinit