mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-08-01 01:19:25 +00:00
Merge upstream/master
This commit is contained in:
@ -26,7 +26,7 @@ if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]];
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Inform gpg-agent of the current TTY for user prompts.
|
# Inform gpg-agent of the current TTY for user prompts.
|
||||||
export GPG_TTY="$(tty)"
|
export GPG_TTY=$TTY
|
||||||
|
|
||||||
# Integrate with the SSH module.
|
# Integrate with the SSH module.
|
||||||
if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
|
if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
|
||||||
|
2
modules/prompt/external/powerlevel10k
vendored
2
modules/prompt/external/powerlevel10k
vendored
Submodule modules/prompt/external/powerlevel10k updated: 9d9c50611d...7306efb94b
Reference in New Issue
Block a user