chezmoi: use new path for homebrew on Apple Silicon

gwarf · Nov 19, 2024 · be15979 · be15979
1 parent 286a372
commit be15979
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/home/private_dot_config/private_fish/config.fish.tmpl b/home/private_dot_config/private_fish/config.fish.tmpl
@@ -85,11 +85,16 @@ if status is-interactive
     end
 
     if test (uname) = Darwin
-        # Add path mainly used by brew
+        # Add homebrew paths
+        {{ if stat "/opt/homebrew/bin/" }}
         fish_add_path /opt/homebrew/bin
+        {{ else -}}
         fish_add_path /usr/local/bin
         fish_add_path /usr/local/sbin
-        fish_add_path /usr/local/opt/coreutils/libexec/gnubin
+        {{ end -}}
+        if test -d /usr/local/opt/coreutils/libexec/gnubin
+            fish_add_path /usr/local/opt/coreutils/libexec/gnubin
+        end
 
         # https://spicetify.app
         if test -e ~/.spicetify

diff --git a/home/private_dot_config/tmux/tmux.conf.tmpl b/home/private_dot_config/tmux/tmux.conf.tmpl
@@ -21,8 +21,13 @@ bind-key b send-prefix
 set -g default-command /usr/local/bin/fish
 set -g default-shell /usr/local/bin/fish
 {{ else if eq .chezmoi.os "darwin" -}}
+{{ if stat "/opt/homebrew/bin/" }}
 set -g default-command /opt/homebrew/bin/fish
 set -g default-shell /opt/homebrew/bin/fish
+{{ else -}}
+set -g default-command /usr/local/bin/fish
+set -g default-shell /usr/local/bin/fish
+{{ end -}}
 {{ else if eq .chezmoi.os "linux" -}}
 set -g default-command /usr/bin/fish
 set -g default-shell /usr/bin/fish