diff --git a/mackup.cfg b/mackup.cfg index fcc616b..5331669 100644 --- a/mackup.cfg +++ b/mackup.cfg @@ -3,6 +3,7 @@ engine = file_system path = /Users/underyx/My Drive (underer@gmail.com) [applications_to_ignore] +aws git gnupg ssh diff --git a/ssh/config b/ssh/config new file mode 100644 index 0000000..096d80d --- /dev/null +++ b/ssh/config @@ -0,0 +1,16 @@ +Include ~/.orbstack/ssh/config + +Host * + AddKeysToAgent yes + UseKeychain yes + IdentityFile ~/.ssh/id_ed25519 + +Host remarkable + HostName 192.168.8.157 + User root + IdentityFile ~/.ssh/remarkable + +Host remarkable-usb + HostName 10.11.99.1 + User root + IdentityFile ~/.ssh/remarkable diff --git a/vimrc b/vimrc index f51e375..5deed04 100644 --- a/vimrc +++ b/vimrc @@ -131,37 +131,3 @@ function! StripTrailingWhitespaces() let @/=_s call cursor(l, c) endfunction - -nnoremap :%!python3 -m json.tool -" ## added by OPAM user-setup for vim / base ## 93ee63e278bdfc07d1139a748ed3fff2 ## you can edit, but keep this line -let s:opam_share_dir = system("opam config var share") -let s:opam_share_dir = substitute(s:opam_share_dir, '[\r\n]*$', '', '') - -let s:opam_configuration = {} - -function! OpamConfOcpIndent() - execute "set rtp^=" . s:opam_share_dir . "/ocp-indent/vim" -endfunction -let s:opam_configuration['ocp-indent'] = function('OpamConfOcpIndent') - -function! OpamConfOcpIndex() - execute "set rtp+=" . s:opam_share_dir . "/ocp-index/vim" -endfunction -let s:opam_configuration['ocp-index'] = function('OpamConfOcpIndex') - -function! OpamConfMerlin() - let l:dir = s:opam_share_dir . "/merlin/vim" - execute "set rtp+=" . l:dir -endfunction -let s:opam_configuration['merlin'] = function('OpamConfMerlin') - -let s:opam_packages = ["ocp-indent", "ocp-index", "merlin"] -let s:opam_check_cmdline = ["opam list --installed --short --safe --color=never"] + s:opam_packages -let s:opam_available_tools = split(system(join(s:opam_check_cmdline))) -for tool in s:opam_packages - " Respect package order (merlin should be after ocp-index) - if count(s:opam_available_tools, tool) > 0 - call s:opam_configuration[tool]() - endif -endfor -" ## end of OPAM user-setup addition for vim / base ## keep this line diff --git a/zinit b/zinit index 358ef03..0c471af 160000 --- a/zinit +++ b/zinit @@ -1 +1 @@ -Subproject commit 358ef03785a18e694e94fd4560e0582c4024bcc3 +Subproject commit 0c471af3fe6aa80a5ddc0fddfb741bc5b3f96cde diff --git a/zsh/environment b/zsh/environment index e15c7f1..065a832 100644 --- a/zsh/environment +++ b/zsh/environment @@ -4,6 +4,8 @@ export LANG=en_US.UTF-8 export GOPATH="$HOME/go" export PATH="./node_modules/.bin:$HOME/.cargo/bin:$HOME/bin:$HOME/.local/bin:$GOPATH/bin:/opt/homebrew/bin:/usr/local/sbin:$PATH" export PIPENV_VENV_IN_PROJECT=true +export SKIP="semgrep" +export AWS_PROFILE="engineer" if exists brew; then export CPATH="$CPATH:$(brew --prefix)/include" diff --git a/zsh/functions b/zsh/functions index 6159e9e..516e50d 100644 --- a/zsh/functions +++ b/zsh/functions @@ -26,3 +26,13 @@ up() { which softwareupdate > /dev/null && softwareupdate -d which npm > /dev/null && npx npm-check -g -u } + +ksecrets() { + if [[ -z $1 ]]; then + echo "Usage: ksecrets " + return 2 + fi + + SECRET_NAME=$1 + kubectl get secret $SECRET_NAME -o json | jq -r '.data | to_entries[] | "\(.key): \(.value | @base64d)"' +} diff --git a/zshrc b/zshrc index 3d58b99..e6c8699 100644 --- a/zshrc +++ b/zshrc @@ -17,3 +17,16 @@ export PNPM_HOME="$HOME/Library/pnpm" test -e "${PNPM_HOME}" && export PATH="$PNPM_HOME:$PATH" test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" + +# pnpm +export PNPM_HOME="/Users/underyx/Library/pnpm" +case ":$PATH:" in + *":$PNPM_HOME:"*) ;; + *) export PATH="$PNPM_HOME:$PATH" ;; +esac +# pnpm end + + +source "$HOME/.rye/env" + +. "$HOME/.cargo/env"