Clean up zsh exports

1 files changed, 37 insertions, 18 deletions

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 7aa4e8b..671bf5c 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -1,5 +1,9 @@
+os=$(uname -s)
+
 . $HOME/.nix-profile/etc/profile.d/nix.sh
 
+[ -n $SSH_CLIENT ] && export MINIMAL_USER_CHAR="$(hostname)"
+
 export GITHUB_HOME=$HOME/Projects
 export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore'
 export ALTERNATE_EDITOR="emacs -nw -Q"
@@ -8,37 +12,52 @@ export VISUAL='emacsclient -c'
 export TERM='xterm-256color'
 export CLICOLOR=1
 
-export PATH="${HOME}/.gem/ruby/2.6.0/bin:/usr/local/bin:${PATH}"
-export PATH="${HOME}/.yarn/bin:${PATH}"
-export PATH="${PATH}:/opt/Xilinx/Vivado/2019.1/bin"
-export PATH="${PATH}:/opt/intelFPGA_lite/18.1/quartus/bin"
-export PATH="${HOME}/.local/bin:${PATH}"
-export PATH="${HOME}/.cargo/bin:${PATH}"
-export PATH="${HOME}/.cabal/bin:${PATH}"
-if [[ -d "${HOME}/.gem/ruby/2.7.0/bin" ]]; then export PATH="${HOME}/.gem/ruby/2.7.0/bin:${PATH}"; fi
-export PATH="/usr/local/bin:${PATH}"
-export PATH="/Library/TeX/texbin:${PATH}"
-export PATH="${PATH}:/Users/yannherklotz/Library/Python/3.7/bin"
-export PATH="/usr/local/opt/bison/bin:$PATH"
+prepend_path() {
+    test -d "$1" && PATH="$1:$PATH"
+}
+
+append_path() {
+    test -d "$1" && PATH="$PATH:$1"
+}
+
+if [ $os = "Darwin" ]; then
+    prepend_path "/Library/TeX/texbin"
+    prepend_path "/usr/local/opt/bison/bin"
+
+    append_path "${HOME}/Library/Python/3.7/bin"
+fi
+
+prepend_path "/usr/local/bin"
+prepend_path "${HOME}/.gem/ruby/2.7.0/bin"
+prepend_path "${HOME}/.yarn/bin"
+prepend_path "${HOME}/.cargo/bin"
+prepend_path "${HOME}/.cabal/bin"
+prepend_path "${HOME}/.local/bin"
+
+append_path "/opt/Xilinx/Vivado/2019.1/bin"
+append_path "/opt/intelFPGA_lite/18.1/quartus/bin"
+
+export PATH
 
 # Stop dotnet telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
 # Fix java windows for tiling window managers
-if [[ $(uname -r) = "Linux" ]]; then export _JAVA_AWT_WM_NONREPARENTING=1; fi
-
-[ -f "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
+[ $os = "Linux" ] && export _JAVA_AWT_WM_NONREPARENTING=1
 
 # Direnv hook setup
 command -v direnv >/dev/null 2>&1
-if [[ "$?" -eq 0 ]]; then eval "$(direnv hook zsh)"; fi
+[ "$?" -eq 0 ] && eval "$(direnv hook zsh)"
 
 # Opam hook setup and initialising it
 command -v opam >/dev/null 2>&1
-if [[ "$?" -eq 0 ]]; then
+if [ "$?" -eq 0 ]; then
     test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
     eval "$(opam env)";
 fi
 
 # Load rust environment
-if [[ -f $HOME/.cargo/env ]]; then source $HOME/.cargo/env; fi
+[ -r $HOME/.cargo/env ] && source $HOME/.cargo/env
+
+# Travis
+[ -r "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"