From 77216522000059e748d28ce93beb0f3c903a2203 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Tue, 26 Oct 2021 16:34:29 -0700
Subject: [PATCH] maint: misc env cleanup

---
 zsh/zshenv | 52 +++++++++++-----------------------------------------
 zsh/zshrc  | 33 ++++++++++++++-------------------
 2 files changed, 25 insertions(+), 60 deletions(-)

diff --git a/zsh/zshenv b/zsh/zshenv
index bfacf69..81b59f2 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -1,41 +1,19 @@
-#
-# Defines environment variables.
-#
-
-#
-# Nix
-#
-
-export NIX_IGNORE_SYMLINK_STORE=1
-
-#
 # Browser
-#
-
 if [[ "$OSTYPE" == darwin* ]]; then
   export BROWSER='open'
 fi
 
-#
 # Editors
-#
-
-export EDITOR='vim'
-export VISUAL='vim'
+export EDITOR='nvim'
+export VISUAL='nvim'
 export PAGER='less'
 
-#
 # Language
-#
-
 if [[ -z "$LANG" ]]; then
   export LANG='en_US.UTF-8'
 fi
 
-#
 # Less
-#
-
 # Set the default Less options.
 # Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
 # Remove -X and -F (exit if the content fits on one screen) to enable it.
@@ -46,10 +24,7 @@ if (( $+commands[lesspipe.sh] )); then
   export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-'
 fi
 
-#
 # Temporary Files
-#
-
 if [[ ! -d "$TMPDIR" ]]; then
   export TMPDIR="/tmp/$USER"
   mkdir -p -m 700 "$TMPDIR"
@@ -59,21 +34,13 @@ TMPPREFIX="${TMPDIR%/}/zsh"
 if [[ ! -d "$TMPPREFIX" ]]; then
   mkdir -p "$TMPPREFIX"
 fi
+# Necessary for tmux on WSL, shouldn't impact macos
+export TMUX_TMPDIR='/tmp'
 
-#
 # Paths
-#
-
 typeset -gU cdpath fpath mailpath path
 
-# Set the the list of directories that cd searches.
-# cdpath=(
-#   .
-#   $cdpath
-# )
-
-# Set the list of directories that Zsh searches for programs.
-path=(
+check_paths=(
   # miniconda
   /opt/miniconda3/bin
 
@@ -81,8 +48,6 @@ path=(
   /opt/local/bin
   /opt/local/sbin
 
-  $path
-
   # npm
   $HOME/.npm-packages/bin
 
@@ -98,7 +63,12 @@ path=(
   /Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/
 )
 
-export -U PATH
+for fp in $check_paths; do
+  if [[ -s "$fp" ]]; then
+    path+=("$fp")
+  fi
+done
 
+export -U PATH
 export CONDA_ENVS_PATH=$HOME/.conda/envs:/opt/miniconda3/envs
 export CONDA_PKGS_DIRS=$HOME/.conda/pkgs
diff --git a/zsh/zshrc b/zsh/zshrc
index de05496..581c416 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,30 +1,25 @@
 # Matthew Dillon
 # matthewrdillon@gmail.com
-#
-# source Prezto.
-if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
-  source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
-fi
 
-if [[ -s "${HOME}/.nix-profile/etc/profile.d/nix.sh" ]]; then
-  source $HOME/.nix-profile/etc/profile.d/nix.sh
-fi
+srcs=(
+  "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
+  "/opt/miniconda3/etc/profile.d/conda.sh"
+  "$HOME/.cargo/env"
+)
 
-if [[ -s "/opt/miniconda3/etc/profile.d/conda.sh" ]]; then
-  source /opt/miniconda3/etc/profile.d/conda.sh
-fi
-
-source "$HOME/.cargo/env"
-
-# shortcuts
-alias q="conda activate q2dev"
-alias i="ipython3"
-alias greg="grep"
-alias vim="nvim"
+for fp in $srcs; do
+  if [[ -s "$fp" ]]; then
+    source "$fp"
+  fi
+done
 
 BASE16_SHELL=$HOME/.config/base16-shell/
 [ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"
 
+alias q="conda activate q2dev"
+alias i="ipython3"
+alias vim="nvim"
+
 # Backup shortcuts (borrowed parts from https://github.com/laurent22/rsync-time-backup
 function prune_backups() {
   dest_root="/Volumes/field_on_fire/$HOST"