X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/27561e82e7e8c73ef73d9d25e66b677b71106108..ad7a214d01c42b9c784e5d2b79466ec25f56bd22:/runcoms/zshrc diff --git a/runcoms/zshrc b/runcoms/zshrc index 3166acf..808616a 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -43,7 +43,7 @@ export VISUAL="nvim" # Python related variables export VIRTUAL_ENV_DISABLE_PROMPT=1 export WORKON_HOME=$HOME/.virtualenvs -export PROJECT_HOME=$HOME/Projects +export PROJECT_HOME=$HOME/Documents/projects export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3" # GPG @@ -51,13 +51,19 @@ 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 ################################################################################ @@ -79,15 +85,23 @@ if [[ -s "/opt/homebrew/bin/brew" ]]; then fi # Z -if ! command -v brew &> /dev/null; then - . /usr/local/etc/profile.d/z.sh -else +if [[ -s "/opt/homebrew/bin/brew" ]]; then . /opt/homebrew/etc/profile.d/z.sh +else + 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 fi