mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-11-21 22:18:07 +01:00
cleanup brew-related config
This commit is contained in:
parent
be629e6c58
commit
256c856778
2 changed files with 11 additions and 9 deletions
|
@ -1,12 +1,14 @@
|
||||||
fish_add_path /opt/homebrew/opt/curl/bin /opt/homebrew/bin /opt/homebrew/sbin $HOME/.local/bin $HOME/.cargo/bin $HOME/go/bin
|
{{- if (get . "brew") }}
|
||||||
{{- if not (get . "sudo") }}
|
{{- if eq .chezmoi.os "darwin" }}
|
||||||
fish_add_path $HOME/.local/homebrew/bin
|
{{- if (get . "sudo") }}
|
||||||
command -v brew > /dev/null; and eval "$(brew shellenv)"
|
eval (/opt/homebrew/bin/brew shellenv)
|
||||||
|
{{- else }}
|
||||||
|
eval ($HOME/.local/homebrew/bin/brew shellenv)
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if eq .chezmoi.os "linux" }}
|
|
||||||
fish_add_path /home/linuxbrew/.linuxbrew/bin $HOME/.local/share/JetBrains/Toolbox/scripts
|
|
||||||
eval "$(brew shellenv)"
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
fish_add_path $HOME/.local/bin $HOME/.cargo/bin $HOME/go/bin
|
||||||
|
|
||||||
set -gx RUSTC_WRAPPER sccache
|
set -gx RUSTC_WRAPPER sccache
|
||||||
|
|
||||||
|
@ -45,7 +47,7 @@ test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shel
|
||||||
set -gx EDITOR nvim
|
set -gx EDITOR nvim
|
||||||
set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
|
set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
|
||||||
|
|
||||||
mise activate fish | source
|
type -q mise && mise activate fish | source
|
||||||
test -e {$HOME}/.config/fish/work.fish; and source {$HOME}/.config/fish/work.fish
|
test -e {$HOME}/.config/fish/work.fish; and source {$HOME}/.config/fish/work.fish
|
||||||
test -e {$HOME}/.config/fish/secrets.fish; and source {$HOME}/.config/fish/secrets.fish
|
test -e {$HOME}/.config/fish/secrets.fish; and source {$HOME}/.config/fish/secrets.fish
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
||||||
|
|
||||||
{{- if eq .chezmoi.os "linux" }}
|
{{- if and (eq .chezmoi.os "linux") (get . "brew") }}
|
||||||
# Set PATH, MANPATH, etc., for Homebrew.
|
# Set PATH, MANPATH, etc., for Homebrew.
|
||||||
[[ -s "/home/linuxbrew/.linuxbrew/bin/brew" ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
[[ -s "/home/linuxbrew/.linuxbrew/bin/brew" ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
Loading…
Reference in a new issue