From: Ruben Beltran del Rio <redacted>
Date: Fri, 15 Apr 2022 09:14:22 +0000 (+0000)
Subject: Merge branch 'main' of gitlab.com:rbdr/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/14a899db10b88c5e4800e34dc208a0ce3b624dcd?ds=sidebyside;hp=-c

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

14a899db10b88c5e4800e34dc208a0ce3b624dcd
diff --combined runcoms/zshrc
index 5f0ed81,98b5967..6d2b00d
--- a/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