diff --git a/dot_config/zsh/01-env.zsh.tmpl b/dot_config/zsh/01-env.zsh.tmpl index 1c7bb62..86fe62f 100644 --- a/dot_config/zsh/01-env.zsh.tmpl +++ b/dot_config/zsh/01-env.zsh.tmpl @@ -7,7 +7,7 @@ export LIBVIRT_DEFAULT_URI="qemu:///session" # Libvirt # # dotnet # -export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 +export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=0 # dotnet # diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 1e71c0e..204c7f0 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -13,7 +13,7 @@ export XDG_STATE_HOME=$HOME/.local/state export ZSH_CACHE_DIR="$XDG_CACHE_HOME/zsh" {{- if eq .chezmoi.os "darwin" }} -export PATH="$PATH:/opt/homebrew/bin" +export PATH="$PATH:/opt/homebrew/bin:/Applications/Xcode.app/Contents/Developer/usr/bin" {{- end }} # scripts from ~/bin diff --git a/private_dot_local/bin/executable_git-credential-rbw b/private_dot_local/bin/executable_git-credential-rbw.tmpl similarity index 91% rename from private_dot_local/bin/executable_git-credential-rbw rename to private_dot_local/bin/executable_git-credential-rbw.tmpl index 5d66d32..46691c4 100644 --- a/private_dot_local/bin/executable_git-credential-rbw +++ b/private_dot_local/bin/executable_git-credential-rbw.tmpl @@ -36,8 +36,11 @@ do [ -n "$user" ] && output=$(rbw get --full "$arg" "$user") && break output=$(rbw get --full "$arg") && break done || exit - +{{ if eq .chezmoi.os "darwin" }} +printf '%s\n' "$output" | gsed -n ' +{{- else }} printf '%s\n' "$output" | sed -n ' +{{- end }} 1{ s/^/password=/p } s/^Username: /username=/p s/^URI: /host=/p