Add aerc config

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 153d73daaf77277de1d7fa030009b50a70290691..8df1b0568e735019ada2a96387b037288e07d4dd 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -1,7 +1,6 @@
 ################################################################################
 # Load Functions
 ################################################################################
 ################################################################################
 # Load Functions
 ################################################################################

-source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/git-info.zsh"

 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/dotenv.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/graphviz.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh"


@@ -28,6 +27,7 @@ export TERM=xterm-256color-italic
 
 # Paths
 # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance
 
 # Paths
 # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance

+export XDG_CONFIG_HOME=$HOME/.config

 export GOPATH=$HOME/Projects/go
 export ANDROID_HOME=$HOME/Library/Android/sdk
 export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle
 export GOPATH=$HOME/Projects/go
 export ANDROID_HOME=$HOME/Library/Android/sdk
 export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle


@@ -35,10 +35,6 @@ export NVM_DIR=$HOME/.nvm
 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
 
 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.
-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


@@ -86,12 +82,24 @@ fi
 if [[ -s "/opt/homebrew/bin/brew" ]]; then
   . /opt/homebrew/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
+  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
 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)/libexec/asdf.sh
 fi
 else
   . $(brew --prefix asdf)/libexec/asdf.sh
 fi

+
+if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then
+  . ~/.asdf/plugins/java/set-java-home.zsh
+fi