jswank/dotfiles
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: jswank:73e1105a687a9f2448aebd4ebd62320ed736f651
Branches Tags
jswank:main
..
compare: jswank:e25d0f0ff5ea7d5bdce5ae4b3a08c81e1cdebb0c
Branches Tags
jswank:main

No commits in common. "73e1105a687a9f2448aebd4ebd62320ed736f651" and "e25d0f0ff5ea7d5bdce5ae4b3a08c81e1cdebb0c" have entirely different histories.
73e1105a68 ... e25d0f0ff5

6 changed files with 8 additions and 52 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,6 +7,3 @@
[submodule "nvim/.config/nvim/pack/bundle/start/fzf-lua"] [submodule "nvim/.config/nvim/pack/bundle/start/fzf-lua"]
path = 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 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

10
nvim/.config/nvim/init.vim
View File

@ -67,16 +67,6 @@ nnoremap <c-p> <cmd>lua require('fzf-lua').files()<CR>
nnoremap <c-\> <cmd>lua require('fzf-lua').buffers()<CR> nnoremap <c-\> <cmd>lua require('fzf-lua').buffers()<CR>
nnoremap <c-g> <cmd>lua require('fzf-lua').grep()<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 " GO stuff

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

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

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

2
tmux/.config/tmux/tmux.conf
View File

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

42
zsh/.zshrc
View File

@ -59,12 +59,12 @@ precmd_functions+=( set_prompt )
# Configure SSH auth sock # Configure SSH auth sock
# #
#if [ -n "$SSH_AUTH_SOCK" ]; then if [ -n "$SSH_AUTH_SOCK" ]; then
# if [ "$SSH_AUTH_SOCK" != $HOME/.ssh/ssh_auth_sock ]; then if [ "$SSH_AUTH_SOCK" != ~/.ssh/ssh_auth_sock ]; then
# ln -sf $SSH_AUTH_SOCK $HOME/.ssh/ssh_auth_sock ln -sf $SSH_AUTH_SOCK ~/.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
# setup SSH keys # setup SSH keys
if [ -e /usr/bin/keychain ]; then if [ -e /usr/bin/keychain ]; then
@ -74,27 +74,6 @@ 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}"
@ -111,14 +90,5 @@ if [[ $#h -gt 0 ]]; then
fi fi
zstyle :compinstall filename '~/.zshrc' 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 autoload -Uz compinit
compinit compinit