X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/54bfa8d06e0950aca6e81d625691e91f21f970fc..refs/heads/main:/runcoms/zshrc?ds=inline diff --git a/runcoms/zshrc b/runcoms/zshrc index 8df1b05..5d51c56 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -6,6 +6,7 @@ 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" +source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/status.zsh" ################################################################################ # Load Modules @@ -23,23 +24,17 @@ source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/modules/aliases.zsh" # ENV VARIABLES ################################################################################ # Terminal related -export TERM=xterm-256color-italic +export TERM=xterm-256color # 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 GOPATH=$HOME/projects/go export ANDROID_HOME=$HOME/Library/Android/sdk export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle -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 -# Python related variables -export VIRTUAL_ENV_DISABLE_PROMPT=1 -export WORKON_HOME=$HOME/.virtualenvs -export PROJECT_HOME=$HOME/Documents/projects - # GPG export GPG_TTY=$(tty) @@ -50,15 +45,6 @@ export GPG_TTY=$(tty) 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!! @@ -75,31 +61,32 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then fi if [[ -s "/opt/homebrew/bin/brew" ]]; then + # Brew Setup export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH -fi - -# Z -if [[ -s "/opt/homebrew/bin/brew" ]]; then + export FZF_VIM_PATH=/opt/homebrew/opt/fzf . /opt/homebrew/etc/profile.d/z.sh + . /opt/homebrew/opt/asdf/libexec/asdf.sh else - if [[ -s "/usr/share/z/z.sh" ]]; then - . /usr/share/z/z.sh + # Z (Linux) + if [[ -s "/usr/libexec/z.sh" ]]; then + . /usr/libexec/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 -fi -# ASDF -if ! command -v brew &> /dev/null; then + # ASDF (Linux) 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 +# ASDF Java if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then . ~/.asdf/plugins/java/set-java-home.zsh fi