sh: move OSX test to top of file

1 files changed, 56 insertions, 52 deletions

diff --git a/.profile b/.profile
index e41945c..f5698a9 100644
--- a/.profile
+++ b/.profile
@@ -1,6 +1,56 @@
 # Moving aliases and other setup to non-shell-specific
 # file ~/.profile
 
+# === OSX ===
+if [ "$(uname -s)" = "Darwin" ]; then
+    # Make bash more posix compliant
+    if [ $SHELL = "/bin/bash" ] || [ $SHELL = "/opt/homebrew/bin/bash" ] || [ $SHELL = "/opt/local/bin/bash" ] ; then
+        set -o posix
+        # OSX-specific bash warning
+        export BASH_SILENCE_DEPRECATION_WARNING=1
+    fi
+
+    # MacPorts setup
+    if [ -d '/opt/local' ]; then
+        export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
+        export MANPATH=/opt/local/share/man:$MANPATH
+    fi
+
+    # Brew (OSX) specifics
+    if [ -f '/opt/homebrew/bin/brew' ]; then
+        export HOMEBREW_PREFIX="/opt/homebrew"
+        export HOMEBREW_CELLAR="/opt/homebrew/Cellar"
+        export 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:-}"
+        if [ -f "/opt/homebrew/etc/bash_completion.d/git-completion.bash" ]; then
+            source /opt/homebrew/etc/bash_completion.d/git-completion.bash;
+        fi
+    fi
+
+    if [ $(command -v python3) ]; then
+        export PATH=$(python3 -m site --user-base)/bin:$PATH
+    fi
+
+    # Load config from filesystem
+    export AWS_SDK_LOAD_CONFIG=1
+
+    # Add Local bin
+    export PATH=$PATH:/Users/tydavis/.local/bin
+
+    # Unlock Keychain cli
+    alias unlock='security unlock-keychain ~/Library/Keychains/login.keychain'
+
+    #upcode alias for quickly updating code where gitrect cannot
+    if [ "$(command -v fd)" ]; then
+        alias upcode="fd -H -t d -E mod -E vendor '.git$' ~/.code -x fetchgit"
+    else
+        alias upcode="find ~/.code -name \".git\" |xargs -n1 fetchgit "
+    fi
+fi
+# === END OSX ===
+
 # Go setup
 if [ -d "$HOME/.golang" ]; then
     ### Just in case it's missing
@@ -59,64 +109,18 @@ if [ "$(command -v btm)" ]; then
     alias btm="btm -m -l --mem_as_value "
 fi
 
-# Lima / Podman
-if [ "$(command -v nerdctl.lima)" ]; then
-    alias docker=nerdctl.lima
+
+# Must put these after OSX setup so brew is part of the $PATH
+# Colima / Podman
+if [ $(command -v colima) ]; then
+    alias docker='colima nerdctl --profile default -- '
+    alias nerdctl='colima nerdctl --profile default -- '
 elif [ "$(command -v podman)" ]; then
     alias docker=podman
     # User-hosted podman socket
     export DOCKER_HOST="unix:$XDG_RUNTIME_DIR/podman/podman.sock"
 fi
 
-# === OSX ===
-if [ "$(uname -s)" = "Darwin" ]; then
-    # Make bash more posix compliant
-    if [ $SHELL = "/bin/bash" ] || [ $SHELL = "/opt/homebrew/bin/bash" ] || [ $SHELL = "/opt/local/bin/bash" ] ; then
-        set -o posix
-        # OSX-specific bash warning
-        export BASH_SILENCE_DEPRECATION_WARNING=1
-    fi
-
-    if [ -d '/opt/local' ]; then
-        export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
-        export MANPATH=/opt/local/share/man:$MANPATH
-    fi
-
-    # Brew (OSX) specifics
-    if [ -f '/opt/homebrew/bin/brew' ]; then
-        export HOMEBREW_PREFIX="/opt/homebrew"
-        export HOMEBREW_CELLAR="/opt/homebrew/Cellar"
-        export 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:-}"
-        if [ -f "/opt/homebrew/etc/bash_completion.d/git-completion.bash" ]; then
-            source /opt/homebrew/etc/bash_completion.d/git-completion.bash;
-        fi
-    fi
-
-    if [ $(command -v python3) ]; then
-        export PATH=$(python3 -m site --user-base)/bin:$PATH
-    fi
-
-    # Load config from filesystem
-    export AWS_SDK_LOAD_CONFIG=1
-
-    # Add Local bin
-    export PATH=$PATH:/Users/tydavis/.local/bin
-
-    # Unlock Keychain cli
-    alias unlock='security unlock-keychain ~/Library/Keychains/login.keychain'
-
-    #upcode alias for quickly updating code where gitrect cannot
-    if [ "$(command -v fd)" ]; then
-        alias upcode="fd -H -t d -E mod -E vendor '.git$' ~/.code -x fetchgit"
-    else
-        alias upcode="find ~/.code -name \".git\" |xargs -n1 fetchgit "
-    fi
-fi
-# === END OSX ===
-
 # Presrving these for future use
 #alias psc='ps xawf -eo pid,user,cgroup,args'
 #alias gdb='gdb -tui'