Merge branch 'main' of git.sr.ht:~rbdr/dotfiles

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index d59c6b9578bf3b0a46586af19db634cf07cb4fbb..ea7d5227d96354ffe4ea716edbf95f281410e63c 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -6,6 +6,7 @@ source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/dotenv.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/graphviz.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/figlet-sample.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/graphviz.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/figlet-sample.zsh"

+source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/prettify-json.zsh"

 
 ################################################################################
 # Load Modules
 
 ################################################################################
 # Load Modules


@@ -32,30 +33,38 @@ 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 ANDROID_HOME=$HOME/Library/Android/sdk
 export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle
 export NVM_DIR=$HOME/.nvm

-export PATH=/usr/local/bin:/usr/local/sbin:$PATH
-export PATH=$PATH:$HOME/Library/Python/2.7/bin

 export PATH=$PATH:$HOME:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 
 # Editor.
 export PATH=$PATH:$HOME:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 
 # Editor.

-export EDITOR="vim"
-export VISUAL="vim"
+export EDITOR="nvim"
+export VISUAL="nvim"

 
 # Python related variables
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
 
 # Python related variables
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs

-export PROJECT_HOME=$HOME/Projects
-export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python"
+export PROJECT_HOME=$HOME/Documents/projects
+export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"

 
 # GPG
 export GPG_TTY=$(tty)
 
 # FZF Config
 
 # GPG
 export GPG_TTY=$(tty)
 
 # FZF Config

-export FZF_DEFAULT_COMMAND='/usr/local/bin/rg --color never --files --hidden -g \!.git'
-export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500'''
+[ -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

 
 

-# Z
-. /usr/local/etc/profile.d/z.sh
+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
+  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

 
 ################################################################################
 # SECRET ENV VARS!!
 
 ################################################################################
 # SECRET ENV VARS!!


@@ -71,4 +80,20 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
   source "${ZDOTDIR:-$HOME}/.zshrc.local"
 fi
 
   source "${ZDOTDIR:-$HOME}/.zshrc.local"
 fi
 

-eval $(/usr/libexec/path_helper -s)
+if [[ -s "/opt/homebrew/bin/brew" ]]; then
+  export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH
+fi
+
+# Z
+if [[ -s "/opt/homebrew/bin/brew" ]]; then
+  . /opt/homebrew/etc/profile.d/z.sh
+else
+  . /usr/local/etc/profile.d/z.sh
+fi
+
+# ASDF
+if ! command -v brew &>  /dev/null; then
+  . $HOME/.asdf/asdf.sh
+else
+  . $(brew --prefix asdf)/asdf.sh
+fi