overhaul of some dotfiles

zshrc

@@ -1,39 +1,45 @@
 # Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
-GITSTATUS_LOG_LEVEL=DEBUG
-
-DEFAULT_USER="bridgway"
+DEFAULT_USER="$USER"
 
 plugins=(git)
 
-# User configuration
+# Editor
+export EDITOR='nvim'
 
+# Go
 export GOPATH=$HOME/go
-export PATH=$PATH:/usr/local/go/bin
+export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+
+# Local bin
+export PATH="$PATH:$HOME/.local/bin:$HOME/bin"
+
+# Node.js and NVM configuration
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 
-export PATH="$PATH:$HOME/.cabal/bin:/opt/cabal/1.22/bin:/opt/ghc/7.10.3/bin:$HOME/.rvm/gems:$HOME/.rvm/bin:$HOME/bin:/usr/local/bin:/usr/local/nwjs:/usr/local/var/postgres"
+# Rust/Cargo
+[ -f "$HOME/.cargo/env" ] && source "$HOME/.cargo/env"
 
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" 
-
-export PATH="$PATH:/opt/nvim-linux64/bin"
 source $ZSH/oh-my-zsh.sh
 source $HOME/dotfiles/aliases.zsh
-# source $HOME/.cargo/env
 
-eval "$(ssh-agent -s)"
-ssh-add -A 2>/dev/null;
+# SSH agent
+if [ -z "$SSH_AGENT_PID" ]; then
+    eval "$(ssh-agent -s)"
+    ssh-add -A 2>/dev/null
+fi
 
-# Set preferred editor
-export EDITOR='vim'
-
-KEYTIMEOUT=1
+# Key timeout
+export KEYTIMEOUT=1
 
+# C++ include path
 export CPLUS_INCLUDE_PATH=/usr/local/include
 
+# FZF (if installed)
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
-eval "$(starship init zsh)"
+# Oh My Posh prompt
+eval "$(oh-my-posh init zsh --config ~/.config/oh-my-posh/theme.omp.json)"