macOS parity

 * remove `make` hack
 * migrate paths to latest homebrew defaults

Author: avindra

.exports

@@ -1,5 +1,3 @@
-#!/usr/bin/sh
-
 # this file is a cross-compatible list of
 # exports for fish and bash. since most
 # shells need to be supported, a very limited

.local/bin/diff

@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/usr/bin/env sh
 ###
 ## Super diff
 ## 1. `diff` by itself shows a diff of cached

.settings

@@ -42,13 +42,18 @@ USER_PATHS="$P0:$P1:$P2:$P5:$P6:$P7:$P8"
 os=$(uname -s)
 if [[ "$os" == "Darwin" ]]; then
 	# Prefer brew python over system python
-	#USER_PATHS="/usr/local/opt/python/libexec/bin:$USER_PATHS"
+	#USER_PATHS="/opt/homebrew/opt/python/libexec/bin:$USER_PATHS"
 
-	# Xcode make never works and is not available in 11.1 beta
-	USER_PATHS="/usr/local/opt/make/libexec/gnubin:$USER_PATHS"
 	# Prefer GNU feature set to BSD ones
-	USER_PATHS="/usr/local/opt/coreutils/libexec/gnubin:$USER_PATHS"
-	export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
+	USER_PATHS="/opt/homebrew/opt/coreutils/libexec/gnubin/:$USER_PATHS"
+
+	# Homebrew
+	USER_PATHS="/opt/homebrew/bin:$USER_PATHS"
+
+	# Mirror Linux PATH
+	USER_PATHS="$HOME/.local/bin:$USER_PATHS"
+
+	export MANPATH="/opt/homebrew/opt/coreutils/libexec/gnuman:$MANPATH"
 fi
 
 ## inject additional dirs