Pull in laptop .zshrc config, merge, add brew plugin

dot_zshrc

@@ -77,51 +77,58 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git yarn sudo zoxide nvm node npm zsh-autosuggestions F-Sy-H)
+plugins=(git yarn sudo zoxide nvm node npm zsh-autosuggestions brew F-Sy-H)
 
 source $ZSH/oh-my-zsh.sh
 
 # User configuration
-if [ -f ~/.bash_aliases ]; then
-	. ~/.bash_aliases
-fi
-
-# bob / neovim package manager
-export PATH="$HOME/.local/share/bob/nvim-bin:$PATH"
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
 # Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
+if [[ -n $SSH_CONNECTION ]]; then
+  export EDITOR='micro'
+else
+  export EDITOR='nvim'
+fi
 
 # Set personal aliases, overriding those provided by oh-my-zsh libs,
 # plugins, and themes. Aliases can be placed here, though oh-my-zsh
 # users are encouraged to define aliases within the ZSH_CUSTOM folder.
 # For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
+if [ -f ~/.bash_aliases ]; then
+	. ~/.bash_aliases
+fi
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
-
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
+export GPG_TTY=$(tty)
+export MICRO_TRUECOLOR=1
+
+# rbenv (ruby)
+eval "$(rbenv init -)"
+
+# brew (obsolete by brew plugin)
+# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+# bun
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+
+# bun completions
+[ -s "/home/xevion/.bun/_bun" ] && source "/home/xevion/.bun/_bun"
+
 export PATH=$PATH:/usr/local/go/bin
 export TERM=xterm-256color  # fixes terminal colors when ssh'ing into laptop
+
+# bob / neovim package manager
+export PATH="$HOME/.local/share/bob/nvim-bin:$PATH"
+
+# java version manager
+export PATH="$HOME/.jenv/bin:$PATH"
+eval "$(jenv init -)"