shenv and upgrade vim-plug

.env

@@ -1,9 +1,5 @@
 # This file sets up the environment
 
-# Don't load this file twice
-# But tmux somehow resets PATH
-[ -z "$_HOME_ENV" -o "$TMUX" ] || return
-
 pathmunge() {
   [ -d "$1" ] && case ":$PATH:" in
     *:$1:*) ;;
@@ -20,7 +16,13 @@ pathmunge "$HOME/bin"
 pathmunge "$HOME/.local/bin"
 
 pathmunge "/home/linuxbrew/.linuxbrew/bin"
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+if [ -e "/home/linuxbrew/.linuxbrew/bin/brew" ]; then
+  eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+fi
+
+if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
+  . "$HOME/.nix-profile/etc/profile.d/nix.sh"
+fi
 
 export PYTHONSTARTUP="$HOME/.pythonrc.py"
 export PAGER="$HOME/bin/vimpager"
@@ -35,6 +37,4 @@ export LSCOLORS="Exfxcxdxbxegedabagacad"
 ls --color=auto > /dev/null 2>&1 || \
   ls -G -d / > /dev/null 2>&1 && export CLICOLOR=yes
 
-export _HOME_ENV=1
-
 # vim: se ft=sh:

.zshrc

@@ -11,16 +11,17 @@ for config ($HOME/.zsh/*.zsh) source "$config"
 # Load and initialize the completion system ignoring insecure directories.
 autoload -Uz compinit && compinit -i
 
-[ -s "$HOME/.shenv" ] && source "$HOME/.shenv"
-[ -s "$HOME/.aliases" ] && source "$HOME/.aliases"
-
 FASD_CACHE="$HOME/.fasd-init-zsh"
 
 if [ "${commands[fasd]}" -nt "$FASD_CACHE" -o ! -f "$FASD_CACHE" ]; then
   fasd --init posix-alias zsh-{hook,ccomp,ccomp-install,wcomp,wcomp-install} \
     >! "$FASD_CACHE"
 fi
 
+if [ -e "$HOME/lib/zsh-yarn-completions/zsh-yarn-completions.plugin.zsh" ]; then
+  source "$HOME/lib/zsh-yarn-completions/zsh-yarn-completions.plugin.zsh"
+fi
+
 source "$FASD_CACHE"
 
 : # set $? to 0