From 9eb553fccc6f16b6ce3f9266fd0c19b0356734a4 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Fri, 15 Sep 2023 09:12:36 +0800
Subject: [PATCH] fix(fish): use `fish_add_path -P`

---
 home/programs/fish/conf.d/01_basic_env.fish |  6 -----
 home/programs/fish/conf.d/01_tooling.fish   | 30 +++++++++++++++++++++
 home/programs/fish/conf.d/02_tooling.fish   | 27 -------------------
 3 files changed, 30 insertions(+), 33 deletions(-)
 delete mode 100644 home/programs/fish/conf.d/01_basic_env.fish
 create mode 100644 home/programs/fish/conf.d/01_tooling.fish
 delete mode 100644 home/programs/fish/conf.d/02_tooling.fish

diff --git a/home/programs/fish/conf.d/01_basic_env.fish b/home/programs/fish/conf.d/01_basic_env.fish
deleted file mode 100644
index e5643cf..0000000
--- a/home/programs/fish/conf.d/01_basic_env.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-# ls
-set -x LS_COLORS "$(vivid generate catppuccin-frappe)"
-
-# nix path patches
-set -p PATH /run/current-system/sw/bin
-set -p PATH "/etc/profiles/per-user/$USER/bin"
diff --git a/home/programs/fish/conf.d/01_tooling.fish b/home/programs/fish/conf.d/01_tooling.fish
new file mode 100644
index 0000000..4db9601
--- /dev/null
+++ b/home/programs/fish/conf.d/01_tooling.fish
@@ -0,0 +1,30 @@
+# ls/exa/eza
+set -x LS_COLORS (vivid generate catppuccin-frappe)
+
+# 1Password SSH
+set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+
+# Homebrew
+/opt/homebrew/bin/brew shellenv | source
+
+# Nix
+fish_add_path -Pm /etc/profiles/per-user/$USER/bin /run/current-system/sw/bin
+
+# fnm shell env
+fnm env --use-on-cd | source
+
+# cargo
+fish_add_path -P "$HOME/.cargo/bin"
+# deno
+fish_add_path -P "$HOME/.deno/bin"
+
+# pnpm
+set -x PNPM_HOME "$HOME/Library/pnpm"
+
+# docker
+fish_add_path -P "$HOME/.docker/bin"
+# local bin
+fish_add_path -P "$HOME/.local/bin"
+
+# suppress greeting
+set fish_greeting
diff --git a/home/programs/fish/conf.d/02_tooling.fish b/home/programs/fish/conf.d/02_tooling.fish
deleted file mode 100644
index a42ad62..0000000
--- a/home/programs/fish/conf.d/02_tooling.fish
+++ /dev/null
@@ -1,27 +0,0 @@
-# 1Password SSH
-set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
-
-# Homebrew shell
-/opt/homebrew/bin/brew shellenv | source
-
-# fnm shell env
-fnm env --use-on-cd | source
-
-# cargo
-set -p PATH "$HOME/.cargo/bin"
-# deno
-set -p PATH "$HOME/.deno/bin"
-
-# pnpm
-set -x PNPM_HOME "$HOME/Library/pnpm"
-
-# direnv
-set -x DIRENV_LOG_FORMAT ""
-
-# docker
-set -p PATH "$HOME/.docker/bin"
-# local bin
-set -p PATH "$HOME/.local/bin"
-
-# fish
-set fish_greeting