diff --git a/zshrc/merlin_devbox.zsh b/zshrc/merlin_devbox.zsh index 25b63ef..a3e41ba 100644 --- a/zshrc/merlin_devbox.zsh +++ b/zshrc/merlin_devbox.zsh @@ -1,11 +1,14 @@ # proxy export HF_ENDPOINT=http://huggingface-proxy-sg.byted.org +export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118 +export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118 +export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.* export http_proxy=http://sys-proxy-rd-relay.byted.org:8118 export https_proxy=http://sys-proxy-rd-relay.byted.org:8118 export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.* -alias proxy_on='export http_proxy=http://sys-proxy-rd-relay.byted.org:8118; export https_proxy=http://sys-proxy-rd-relay.byted.org:8118; export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.*' -alias proxy_off='unset http_proxy; unset https_proxy; unset no_proxy' +alias proxy_on='export http_proxy=http://sys-proxy-rd-relay.byted.org:8118; export https_proxy=http://sys-proxy-rd-relay.byted.org:8118; export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.*; export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.*' +alias proxy_off='unset http_proxy; unset https_proxy; unset no_proxy; unset HTTP_PROXY; unset HTTPS_PROXY; unset NO_PROXY' # Merlin devbox specific aliases alias l=ls diff --git a/zshrc/p10k.zsh b/zshrc/p10k.zsh index cbb8bef..bb88e23 100644 --- a/zshrc/p10k.zsh +++ b/zshrc/p10k.zsh @@ -242,7 +242,7 @@ # - verbose: Enable instant prompt and print a warning when detecting console output during # zsh initialization. Choose this if you've never tried instant prompt, haven't # seen the warning, or if you are unsure what this all means. - typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose + typeset -g POWERLEVEL9K_INSTANT_PROMPT=off # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload