X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/086f96e45c174eaf53a2cbae7d60554a66e44c74..08ea1b60270d697fff5992eb9b665cec35493b6d:/runcoms/zshrc diff --git a/runcoms/zshrc b/runcoms/zshrc index 98b5967..9555055 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -29,11 +29,10 @@ export TERM=xterm-256color-italic # Paths # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance export GOPATH=$HOME/Projects/go -export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH export ANDROID_HOME=$HOME/Library/Android/sdk export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle export NVM_DIR=$HOME/.nvm -export PATH=$PATH:$HOME:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin +export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS # Editor. @@ -44,20 +43,25 @@ export VISUAL="nvim" export VIRTUAL_ENV_DISABLE_PROMPT=1 export WORKON_HOME=$HOME/.virtualenvs export PROJECT_HOME=$HOME/Documents/projects -export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3" # GPG export GPG_TTY=$(tty) # FZF Config [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +[ -f /usr/share/doc/fzf/examples/key-bindings.zsh ] && source /usr/share/doc/fzf/examples/key-bindings.zsh +[ -f /usr/share/doc/fzf/examples/completion.zsh ] && source /usr/share/doc/fzf/examples/completion.zsh export FZF_DEFAULT_COMMAND='/usr/bin/env rg --color never --files --hidden -g \!.git' export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500''' if [[ -s "/opt/homebrew/bin/brew" ]]; then export FZF_VIM_PATH=/opt/homebrew/opt/fzf else - export FZF_VIM_PATH=/usr/local/opt/fzf + if [[ -s "/usr/local/bin/brew" ]]; then + export FZF_VIM_PATH=/usr/local/opt/fzf + else + export FZF_VIM_PATH=/usr/share/doc/fzf/examples + fi fi ################################################################################ @@ -82,12 +86,20 @@ fi if [[ -s "/opt/homebrew/bin/brew" ]]; then . /opt/homebrew/etc/profile.d/z.sh else - . /usr/local/etc/profile.d/z.sh + if [[ -s "/usr/share/z/z.sh" ]]; then + . /usr/share/z/z.sh + else + . /usr/local/etc/profile.d/z.sh + fi fi # ASDF if ! command -v brew &> /dev/null; then - . $HOME/.asdf/asdf.sh + if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then + . /opt/asdf-vm/asdf.sh + else + . $HOME/.asdf/asdf.sh + fi else - . $(brew --prefix asdf)/asdf.sh + . $(brew --prefix asdf)/libexec/asdf.sh fi