Skip to content

Commit

Permalink
bunch of updates
Browse files Browse the repository at this point in the history
  • Loading branch information
underyx committed Nov 13, 2024
1 parent db1adfe commit de00c11
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 35 deletions.
1 change: 1 addition & 0 deletions mackup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ engine = file_system
path = /Users/underyx/My Drive ([email protected])

[applications_to_ignore]
aws
git
gnupg
ssh
Expand Down
16 changes: 16 additions & 0 deletions ssh/config
Original file line number Diff line number Diff line change
@@ -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
34 changes: 0 additions & 34 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -131,37 +131,3 @@ function! <SID>StripTrailingWhitespaces()
let @/=_s
call cursor(l, c)
endfunction

nnoremap <C-f> :%!python3 -m json.tool<CR>
" ## 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
2 changes: 2 additions & 0 deletions zsh/environment
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions zsh/functions
Original file line number Diff line number Diff line change
Expand Up @@ -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 <secret>"
return 2
fi

SECRET_NAME=$1
kubectl get secret $SECRET_NAME -o json | jq -r '.data | to_entries[] | "\(.key): \(.value | @base64d)"'
}
13 changes: 13 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit de00c11

Please sign in to comment.