From 92f3c3ed9f3430cc6c97933e2d04c10c4a0d89cb Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <gpg@kogakure.8shield.net>
Date: Tue, 17 Sep 2024 11:13:40 +0200
Subject: [PATCH] fix(fish): problem with PATH order

---
 config/fish/config.fish | 54 +++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 880959e..aca3eaa 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -70,44 +70,40 @@ set -x VOLTA_HOME $HOME/.volta
 
 # *** *** Session Paths *** ***
 
-# Volta
-fish_add_path $VOLTA_HOME/bin
-
-# Rust
-fish_add_path $HOME/.cargo/bin
-
-# tmux plugins
-fish_add_path $HOME/.tmux/plugins/tmux-nvr/bin
-fish_add_path $HOME/.tmux/plugins/t-smart-tmux-session-manager/bin
-
-# Personal
-fish_add_path $HOME/.dotfiles/bin
-fish_add_path $HOME/.dotfiles/private/bin
-
 # Homebrew
-fish_add_path (brew --prefix)/bin
-fish_add_path (brew --prefix)/sbin
-fish_add_path (brew --prefix)/whalebrew/bin
-
-# System
-fish_add_path /usr/bin
-fish_add_path /usr/local/bin
-fish_add_path /usr/local/sbin
+eval "$($brew_prefix/bin/brew shellenv)"
 
 # asdf
-fish_add_path $HOME/.asdf/shims
+set -l asdf_path (brew --prefix asdf)
+if test -f $asdf_path/libexec/asdf.fish
+    source $asdf_path/libexec/asdf.fish
+    set -x PATH $HOME/.asdf/shims $PATH
+end
+
+# Volta
+set -x PATH $PATH $VOLTA_HOME/bin
+
+# Rust
+set -x PATH $PATH $HOME/.cargo/bin
+
+# tmux plugins
+set -x PATH $PATH $HOME/.tmux/plugins/tmux-nvr/bin
+set -x PATH $PATH $HOME/.tmux/plugins/t-smart-tmux-session-manager/bin
+
+# Personal
+set -x PATH $PATH $HOME/.dotfiles/bin
+set -x PATH $PATH $HOME/.dotfiles/private/bin
+
+# System
+set -x PATH $PATH /usr/bin
+set -x PATH $PATH /usr/local/bin
+set -x PATH $PATH /usr/local/sbin
 
 # Stable Diffusion Webui
 # set VIRTUAL_ENV $HOME/Code/AI/stable-diffusion-webui/venv
 
 # *** *** Tools *** ***
 
-# Homebrew
-eval "$($brew_prefix/bin/brew shellenv)"
-
-# asdf
-source (brew --prefix asdf)/libexec/asdf.fish
-
 # GitHub CLI completion
 if command -v gh >/dev/null 2>&1
     eval "$(gh completion -s fish)"