diff --git a/dot_cargo/env.fish b/dot_cargo/env.fish deleted file mode 100644 index b6549f5..0000000 --- a/dot_cargo/env.fish +++ /dev/null @@ -1,5 +0,0 @@ -# rustup shell setup -if not contains "{cargo_bin}" $PATH - # Prepending path in case a system-installed rustc needs to be overridden - set -x PATH "{cargo_bin}" $PATH -end diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/private_fish/config.fish.tmpl index 28ac5a2..840f7b4 100644 --- a/dot_config/private_fish/config.fish.tmpl +++ b/dot_config/private_fish/config.fish.tmpl @@ -3,19 +3,14 @@ if status is-interactive set -gx EDITOR nvim - source "$HOME/.cargo/env.fish" +{{ if eq .chezmoi.os "linux" }} # rustup shell setup + if not contains "{cargo_bin}" $PATH + # Prepending path in case a system-installed rustc needs to be overridden + set -x PATH "{cargo_bin}" $PATH + end{{ end }} atuin init fish | source mise activate fish | source zoxide init fish | source chezmoi completion fish | source starship init fish | source - - # Setup dynamic aliases and completions for ~/.local/tools Python scripts - if test -d ~/.local/tools - for script in ~/.local/tools/*.py - set -l script_name (basename $script .py) - set -l script_upper (string upper $script_name | string replace -a '-' '_' | string replace -a '.' '_') - alias $script_name="uv run $script" - end - end end