Here are my new patches:
Yeh, just add ~/.zshrc to source /etc/profie is enough.