diff --git a/dot_config/nushell/env.nu.tmpl b/dot_config/nushell/env.nu.tmpl index 0a071bd..ae391c4 100644 --- a/dot_config/nushell/env.nu.tmpl +++ b/dot_config/nushell/env.nu.tmpl @@ -22,11 +22,11 @@ def add_xdg [name ...parts] { } def from_string [] { - $in | split row (char esep) | path expand --no-symlink + split row (char esep) | path expand --no-symlink } def to_string [] { - $in | path expand --no-symlink | str join (char esep) + path expand --no-symlink | str join (char esep) } load-env { @@ -60,20 +60,18 @@ load-env { BAT_THEME: zenburn MANPAGER: "sh -c 'col -bx | bat --language man --plain'" CLICOLOR: 1 - GOPRIVATE: github.com/HelloTech PULUMI_SKIP_UPDATE_CHECK: true NPM_CONFIG_USERCONFIG: $'($env.XDG_CONFIG_HOME)/npm/npmrc' RIPGREP_CONFIG_PATH: $'($env.XDG_CONFIG_HOME)/ripgrep/config' PATH: ([ $env.XDG_BIN_HOME + /opt/homebrew/bin ($'($env.CARGO_HOME?)' | path join "bin") ($'($env.HOME)/go/bin') ($'($env.HOME)/.rbenv/shims') ($'($env.HOME)/.local/share/JetBrains/Toolbox/scripts') ($'($env.HOME)/google-cloud-sdk/bin') - /usr/local/opt/mysql-client/bin - /usr/local/Cellar/postgresql@14/14.15/bin /usr/local/bin ...($env.PATH | split row (char esep)) /snap/bin diff --git a/dot_config/profile/profile.d/base.sh.tmpl b/dot_config/profile/profile.d/base.sh.tmpl index 4521a20..f7e5172 100644 --- a/dot_config/profile/profile.d/base.sh.tmpl +++ b/dot_config/profile/profile.d/base.sh.tmpl @@ -12,6 +12,12 @@ if [ -d "${HOME}/go/bin" ] && ! echo "$PATH" | grep -q "${HOME}/go/bin" ; then fi #{{- end }} +#{{- if stat "/opt/homebrew/bin" }} +if [ -d /opt/homebrew/bin ] ; then + PATH=/opt/homebrew/bin:${PATH} +fi +#{{- end }} + #{{- if stat "/usr/local/opt/mysql-client/bin" }} #{{/* if mysql client is installed from homebrew */}} if [ -d /usr/local/opt/mysql-client/bin ] ; then