diff --git a/fish/.config/fish/conf.d/rustup.fish b/fish/.config/fish/conf.d/rustup.fish deleted file mode 100644 index e4cb363..0000000 --- a/fish/.config/fish/conf.d/rustup.fish +++ /dev/null @@ -1 +0,0 @@ -source "$HOME/.cargo/env.fish" diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 6ac42b7..277c368 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -43,20 +43,25 @@ else if test "$host" = "lovelace" else if test "$host" = "lee" fish_add_path ~/.local/bin end + +source "$HOME/.cargo/env.fish" 2>/dev/null + +set -gx HOMEBREW_BUNDLE_FILE "~/.config/Brewfile" + if test -d /home/linuxbrew/.linuxbrew # Homebrew is installed on Linux set -gx HOMEBREW_PREFIX "/home/linuxbrew/.linuxbrew" set -gx HOMEBREW_CELLAR "/home/linuxbrew/.linuxbrew/Cellar" set -gx HOMEBREW_REPOSITORY "/home/linuxbrew/.linuxbrew/Homebrew" - set -gx PATH "/home/linuxbrew/.linuxbrew/bin" "/home/linuxbrew/.linuxbrew/sbin" $PATH + set -gx PATH "/home/linuxbrew/.linuxbrew/bin" "/home/linuxbrew/.linuxbrew/sbin" "/home/linuxbrew/.linuxbrew/opt/rustup/bin" $PATH set -q MANPATH; or set MANPATH '' set -gx MANPATH "/home/linuxbrew/.linuxbrew/share/man" $MANPATH set -q INFOPATH; or set INFOPATH '' set -gx INFOPATH "/home/linuxbrew/.linuxbrew/share/info" $INFOPATH - # Homebrew asked for this in order to `brew upgrade` - set -gx HOMEBREW_GITHUB_API_TOKEN {api token goes here, don't remember where that's created} + + end if status is-interactive