ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00
Code Activity

fix(fish): use set -p PATH instead of fish_add_path

Browse source 
The reasoning for this is that `fish_add_path` writes to a universal variable that is persisted independently of fish configuration files, and this can result in stale `fish_user_paths` entries when calls to `fish_add_path` are removed from the configuration. Using `set -p PATH` ensures that only the environment is written to.
This commit is contained in:
Ryan Cao 2023-09-15 08:46:22 +08:00
parent eb4cb1c367
commit da2644ae42
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
5 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/programs/fish/conf.d/01_basic_env.fish
View file

@ -2,5 +2,5 @@
set -x LS_COLORS "$(vivid generate catppuccin-frappe)"
# nix path patches
fish_add_path /run/current-system/sw/bin
fish_add_path "/etc/profiles/per-user/$USER/bin"
set -p PATH /run/current-system/sw/bin
set -p PATH "/etc/profiles/per-user/$USER/bin"

8
home/programs/fish/conf.d/02_tooling.fish
View file

@ -8,9 +8,9 @@ set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/
fnm env --use-on-cd | source
# cargo
fish_add_path "$HOME/.cargo/bin"
set -p PATH "$HOME/.cargo/bin"
# deno
fish_add_path "$HOME/.deno/bin"
set -p PATH "$HOME/.deno/bin"
# pnpm
set -x PNPM_HOME "$HOME/Library/pnpm"
@ -19,9 +19,9 @@ set -x PNPM_HOME "$HOME/Library/pnpm"
set -x DIRENV_LOG_FORMAT ""
# docker
fish_add_path "$HOME/.docker/bin"
set -p PATH "$HOME/.docker/bin"
# local bin
fish_add_path "$HOME/.local/bin"
set -p PATH "$HOME/.local/bin"
# fish
set fish_greeting