Cleanup

dotfiles/zshrc.d/alert.zsh

@@ -18,8 +18,15 @@ alert() {
     icon="error"
   fi
   
-  # Send the notification with the executed command
-  notify-send --urgency=low -i "$icon" "Finished: '$@'"
+  if [ "$(uname)" = "Darwin" ]; then
+    # macOS notification
+    local title="Finished: '$*'"
+    local msg="Exit code: $ret"
+    osascript -e "display notification \"$msg\" with title \"$title\""
+  else
+    # Send the notification with the executed command
+    notify-send --urgency=low -i "$icon" "Finished: '$@'"
+  fi
   
   # Return the original exit code
   return $ret

dotfiles/zshrc.d/android.zsh

@@ -1,7 +1,12 @@
-ANDROID_HOME=$HOME/Library/Android/sdk
+if [ "$(uname)" = "Darwin" ]; then
+  ANDROID_HOME=$HOME/Library/Android/sdk
+else
+  ANDROID_HOME=$HOME/Android/Sdk
+fi
 
-if test -d $ANDROID_HOME ; then
-  PATH=$PATH:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools
+if test -d "${ANDROID_HOME}" ; then
+  export ANDROID_HOME
+  PATH="${PATH}:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools"
 else
   unset ANDROID_HOME
 fi

dotfiles/zshrc.d/assemble.zsh

@@ -6,7 +6,11 @@ if have_command nasm && have_command objdump ; then
     local TMPF=`mktemp`
     local bytes
     local byte
-    $NASM -f elf -o $TMPF $1
+    local format="elf"
+    if [[ "$OSTYPE" == darwin* ]]; then
+      format="macho64"
+    fi
+    $NASM -f $format -o $TMPF $1
     $OBJDUMP -M intel -d $TMPF | grep '^ ' | cut -f2 | while read -A bytes ; do
       for byte in $bytes ; do
         echo -n "\\\\x$byte"

dotfiles/zshrc.d/functions.zsh

@@ -1,5 +1,11 @@
 function dumpenv {
-  tr '\0' '\n' < /proc/${1}/environ
+  if [ "$(uname)" = "Linux" ]; then
+    tr '\0' '\n' < /proc/${1}/environ
+  elif [ "$(uname)" = "Darwin" ]; then
+    # macOS doesn't have /proc, use ps instead. 
+    # Note: this may truncate if environment is very large.
+    ps -p ${1} -wwwe -o command= | tr ' ' '\n' | grep '='
+  fi
 }
 
 if test -x "/sbin/starship" ; then

dotfiles/zshrc.d/lesshighlight.zsh

@@ -1,8 +1,20 @@
-test -f /usr/share/source-highlight/src-hilite-lesspipe.sh && \
+# Find src-hilite-lesspipe.sh
+_SRCHILITE=""
+for _p in /usr/share/source-highlight/src-hilite-lesspipe.sh /opt/homebrew/bin/src-hilite-lesspipe.sh /usr/local/bin/src-hilite-lesspipe.sh ; do
+  if [ -f "$_p" ] ; then
+    _SRCHILITE="$_p"
+    break
+  fi
+done
+
+if [ -n "$_SRCHILITE" ] ; then
   function srcless {
     if [ $# -ne 1 ] ; then
-      echo "$0 <what>" > /dev/stderr
+      echo "Usage: srcless <file>" > /dev/stderr
       return 1
     fi
-    /usr/share/source-highlight/src-hilite-lesspipe.sh $1 | less -R
+    "$_SRCHILITE" "$1" | less -R
   }
+fi
+
+unset _SRCHILITE _p