Merge branch 'main' of gitlab.com:rbdr/dotfiles

diff --combined runcoms/zshrc
index 5f0ed8112e63a37a267af2420775215e96645893,98b59679d37f946ca6770fe62554f51008788e2f..6d2b00ddb37c9093518a6d193a81d8b0452192d7
--- 1/runcoms/zshrc
--- 2/runcoms/zshrc
+++ b/runcoms/zshrc
@@@ -43,23 -43,21 +43,25 @@@ 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
  export GPG_TTY=$(tty)
  
  # FZF Config
+ [ -f ~/.fzf.zsh ] && source ~/.fzf.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 "/opt/homebrew/bin/brew" ]]; then
 +    export FZF_VIM_PATH=/usr/local/opt/fzf
 +  else
 +    export FZF_VIM_PATH=/usr/share/doc/fzf/examples
 +  fi
  fi
  
  ################################################################################
@@@ -81,10 -79,10 +83,10 @@@ if [[ -s "/opt/homebrew/bin/brew" ]]; t
  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
+   . /usr/local/etc/profile.d/z.sh
  fi
  
  # ASDF