From 02f9ef9eefab790eb199c96a23ab75699f899631 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Mon, 24 Jul 2023 13:02:25 +0200 Subject: [PATCH] Update .zshrc --- dot_zshrc.tmpl | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index d7173f7..a20ab98 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -15,19 +15,21 @@ LW_PATH=~/git/github.com/lunarway GOPATH=~/go GOBIN="$GOPATH/bin" PATH="$GOBIN:$PATH:$HOME/bin/:$HOME/.local/bin/:$HOME/.dotnet/tools" +{{ if .homebrew }} export PATH="/opt/homebrew/opt/libpq/bin:$HOME/.git-bins/:$PATH" export PATH="/opt/homebrew/opt/openjdk/bin:$PATH:$(brew --prefix llvm)/bin:$(brew --prefix llvm)/lib" +{{ end }} export SHUTTLE_REMOTE_TRACING=default export SHUTTLE_REMOTE_TRACING_URL=https://shuttle-telemetry.dev.lunar.tech/publish/batch -export GITHUB_TOKEN=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 -export GITHUB_ACCESS_TOKEN=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 +export GITHUB_TOKEN={{ .github_token | quote }} +export GITHUB_ACCESS_TOKEN="$GITHUB_TOKEN" export HOMEBREW_GITHUB_API_TOKEN="$GITHUB_ACCESS_TOKEN" -export GITHUB_LUNAR_CI_TOKEN=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 -export RENOVATE_TOKEN=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 +export GITHUB_LUNAR_CI_TOKEN="$GITHUB_ACCESS_TOKEN" +export RENOVATE_TOKEN={{ .renovate_token | quote }} export SRC_ENDPOINT=https://lunar.sourcegraph.com -export SRC_ACCESS_TOKEN=29729894d1a59e4bd82378f7248cc6e752217be7 +export SRC_ACCESS_TOKEN={{ .source_graph_token | quote }} export GITHUB_FC_ROOT="/Users/kah/git/github.com" export GITHUB_FC_ORGS="lunarway,kjuulh" export BITEME_ROOT="$HOME/Documents/vaults/kjuulh" @@ -41,10 +43,12 @@ alias lg="lazygit" export LW_DEFAULT_THEME='false' export EDITOR=hx -export HAMCTL_AUTH_TOKEN=RrZa8JGgLJW87rZfegyKkCE8cgJ8Vc9t +export HAMCTL_AUTH_TOKEN={{ .hamctl_token | quote }} fpath=("$HOME/.zsh_completions/" $fpath) +{{ if .homebrew }} fpath=("$(brew --prefix)/share/zsh/site-functions" $fpath) +{{ end }} # Use degit for faster cloning #zstyle ':zim:completion' dumpfile @@ -105,33 +109,22 @@ alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' ## Dev hamctl #alias devhamctl='HAMCTL_URL="https://some-url" go run github.com/lunarway/release-manager cmd/hamctl/main.go' +{{ if .lunar }} k8s_init kah@lunar.app admin +{{ end }} + #k8s_init kah@lunar.app dev #eval "$(starship init zsh)" eval "$(zoxide init zsh)" # pnpm -export PNPM_HOME="/Users/kah/Library/pnpm" +export PNPM_HOME="{{ .pnpm_home }}" export PATH="$PNPM_HOME:$PATH" # pnpm end # alias ,="source ,cd" -alias ,code="toolkit stats code" -alias ,network="toolkit stats network" -alias ,procs="toolkit stats procs" -alias ,storage="toolkit stats storage" -alias ,perf="toolkit stats perf" - -source ~/bin/,git-toolkit -#source ~/bin/git-shortcuts.sh -source ~/bin/terraform.sh -source ~/bin/zimfwupdate.sh -source ~/bin/sanity.sh -source ~/bin/ssh-agent.sh -#source ~/bin/lunardev.sh -source ~/bin/tmux.sh export SHUTTLE_CACHE_DURATION_MIN=10080 @@ -141,20 +134,16 @@ alias python=python3 alias pip=pip3 export LESS=-R export _EXPERIMENTAL_DAGGER_TUI=yep -export OPENAI_API_KEY=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 +export OPENAI_API_KEY={{ .openai_token | quote }} eval "$(starship init zsh)" #zprof export ANSIBLE_VAULT_PASSWORD_FILE="~/.config/ansible/password" export DRONE_SERVER=https://ci.i.kjuulh.io -export DRONE_TOKEN=z1gpPUNI0dAgxtCqvk1aFhyyRn6S1n05 -export GITEA_ACCESS_TOKEN="ce9e500e0dace93d17305b36cd4255dba1d41ad0" +export DRONE_TOKEN={{ .drone_token | quote }} +export GITEA_ACCESS_TOKEN={{ .gitea_token | quote }} export GITEA_URL="https://git.i.kjuulh.io/api/v1" export GITEA_ORG="kjuulh" - -ulimit -n 4096 - - #zprof