icedream
/
profile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: icedream:56c289a05aac6a5289d9cbe2cc8b38dbe79ce0b5
Branches Tags
icedream:master
..
compare: icedream:4e59fb1ece9b1732b90625dad6998b975342d0b8
Branches Tags
icedream:master

No commits in common. "56c289a05aac6a5289d9cbe2cc8b38dbe79ce0b5" and "4e59fb1ece9b1732b90625dad6998b975342d0b8" have entirely different histories.
56c289a05a ... 4e59fb1ece

1 changed files with 0 additions and 45 deletions
Show Stats Expand all files Collapse all files

45
home/dotfiles/zshrc
View File

@ -19,11 +19,8 @@ ZSH_ALIAS=${ZSH_ALIAS:-1}
ZSH_COMPAT_BASH_COMPLETION=${ZSH_COMPAT_BASH_COMPLETION:-1} ZSH_COMPAT_BASH_COMPLETION=${ZSH_COMPAT_BASH_COMPLETION:-1}
ZSH_CUSTOM=${ZSH_CUSTOM:-1} ZSH_CUSTOM=${ZSH_CUSTOM:-1}
ZSH_DEFAULT_TERM=${ZSH_DEFAULT_TERM:-1} ZSH_DEFAULT_TERM=${ZSH_DEFAULT_TERM:-1}
ZSH_GCLOUD_FIXES=${ZSH_GCLOUD_FIXES:=$(when_binary_available gcloud)}
ZSH_GPG_PINENTRY_FIX=${ZSH_GPG_PINENTRY_FIX:-1} ZSH_GPG_PINENTRY_FIX=${ZSH_GPG_PINENTRY_FIX:-1}
ZSH_GPG_SSH_AGENT=${ZSH_GPG_SSH_AGENT:-$(has_binary gpgconf && [ -z "${SSH_AUTH_SOCK:-}" ] && [ -f $(gpgconf --list-dirs agent-ssh-socket) ] && printf 1 || printf 0)}
ZSH_LOGO_LS=${ZSH_LOGL_LS:-$(when_binary_available logo-ls)} ZSH_LOGO_LS=${ZSH_LOGL_LS:-$(when_binary_available logo-ls)}
ZSH_OPAM=${ZSH_OPAM:-$(when_binary_available opam)}
ZSH_PIPX=${ZSH_PIPX:-$(when_binary_available pipx)} ZSH_PIPX=${ZSH_PIPX:-$(when_binary_available pipx)}
ZSH_POWERLINE="${ZSH_POWERLINE:-1}" ZSH_POWERLINE="${ZSH_POWERLINE:-1}"
ZSH_PRESERVE_HISTORY="${ZSH_PRESERVE_HISTORY:-1}" ZSH_PRESERVE_HISTORY="${ZSH_PRESERVE_HISTORY:-1}"
@ -169,40 +166,6 @@ if [ $ZSH_SYNTAX_HIGHLIGHTING -gt 0 ]; then
fi fi
section_end section_end
# opam
section "opam"
if [ $ZSH_OPAM -gt 0 ]; then
[[ ! -r ~/.opam/opam-init/init.zsh ]] || source ~/.opam/opam-init/init.zsh >/dev/null 2>/dev/null
fi
section_end
# gcloud fixes
section "gcloud fixes"
if [ $ZSH_GCLOUD_FIXES -gt 0 ]; then
log "Overriding gcloud command"
_local_zshrc_ssh_config_needs_cleanup() {
[ ! -f ~/.ssh/config ] || grep -iq '^\s\+IdentityFile' ~/.ssh/config
}
_local_zshrc_clean_up_ssh_config() {
if [ -f ~/.ssh/config ]; then
# avoid apps such as gcloud referencing their own SSH key, we have our own hardware-backed one, damn it!
sed -i -e 's/^\(\s\+\)IdentityFile/\1# Modified by ~\/.local_zshrc\n\1#IdentityFile/i' ~/.ssh/config
fi
}
gcloud() {
command gcloud "$@"
}
if has_binary gke-gcloud-auth-plugin; then
# avoid deprecation warning about gcloud auth by simply using the new plugin
log "Setting USE_GKE_GCLOUD_AUTH_PLUGIN=True to avoid deprecation warning"
USE_GKE_GCLOUD_AUTH_PLUGIN=True
fi
fi
section_end
# symfony cli # symfony cli
section "symfony cli" section "symfony cli"
if [ $ZSH_SYMFONY_CLI -gt 0 ]; then if [ $ZSH_SYMFONY_CLI -gt 0 ]; then
@ -240,14 +203,6 @@ if [ $ZSH_GPG_PINENTRY_FIX -gt 0 ]; then
fi fi
section_end section_end
# gpg ssh agent
section "gpg ssh agent"
if [ $ZSH_GPG_SSH_AGENT -gt 0 ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
log "Changed SSH_AUTH_SOCK to $SSH_AUTH_SOCK (GnuPG SSH agent)"
gpgconf --launch gpg-agent
fi
# logo-ls # logo-ls
section "logo-ls" section "logo-ls"
if [ $ZSH_LOGO_LS -gt 0 ]; then if [ $ZSH_LOGO_LS -gt 0 ]; then