From 56722c33c198b94413c05311509dbf9415950483 Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@gmail.com>
Date: Sun, 7 Nov 2021 08:10:47 -0500
Subject: [PATCH] Make sure Mac works

---
 zsh/.zshenv | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/zsh/.zshenv b/zsh/.zshenv
index 3dc5745..f052ceb 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -9,13 +9,16 @@ GNU_TOOLS_PATH="/opt/homebrew/opt/coreutils/libexec/gnubin"
 GNU_TOOLS_MAN_PATH="/opt/homebrew/opt/coreutils/libexec/gnuman"
 
 if [[ "$OSTYPE" == darwin* ]]; then
-  export HOMEBREW_PREFIX="/opt/homebrew";
-  export HOMEBREW_CELLAR="/opt/homebrew/Cellar";
-  export HOMEBREW_REPOSITORY="/opt/homebrew";
+  HOMEBREW_PREFIX="/opt/homebrew";
+  HOMEBREW_CELLAR="/opt/homebrew/Cellar";
+  HOMEBREW_REPOSITORY="/opt/homebrew";
 
-  export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}";
-  export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:";
-  export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}";
+  # Added by .zprofile that we've moved
+  PATH="/usr/local/bin:/Library/Apple/usr/bin:$PATH"
+
+  PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}";
+  MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:";
+  INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}";
 
   [[ -d "$GNU_TOOLS_PATH" ]] && PATH="$GNU_TOOLS_PATH:$PATH"
   [[ -d "$GNU_TOOLS_MAN_PATH" ]] && MANPATH="$GNU_TOOLS_MAN_PATH:$MANPATH"
@@ -31,7 +34,8 @@ fi
 
 [[ -d "$LOCAL_HOME_BIN_PATH" ]] && PATH="$LOCAL_HOME_BIN_PATH:$PATH"
 [[ -d "$PERSONAL_BIN_PATH" ]] && PATH="$PERSONAL_BIN_PATH:$PATH"
-[[ -d "$PERSONAL_COMPLETIONS_PATH" ]] && fpath=($PERSONAL_COMPLETIONS_PATH $fpath)
+[[ -d "$PERSONAL_COMPLETIONS_PATH" ]] && FPATH="$PERSONAL_COMPLETIONS_PATH:$FPATH"
 
 # EDITOR
-export {EDITOR,GIT_EDITOR}=vim
+EDITOR=vim
+GIT_EDITOR=vim