From af296b7077ed248b5021f664b7c8e8aa2f7cbcbb Mon Sep 17 00:00:00 2001
From: rydesun <rydesun@gmail.com>
Date: Wed, 11 May 2022 15:07:50 +0800
Subject: [PATCH] Arrange vars

---
 .config/zsh/zshrc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc
index 41cf612..5aa9307 100644
--- a/.config/zsh/zshrc
+++ b/.config/zsh/zshrc
@@ -3,12 +3,12 @@ _ZSH_DATA_DIR=${XDG_DATA_HOME}/zsh
 _ZSH_CACHE_DIR=${XDG_CACHE_HOME}/zsh
 _ZSH_PLUG_DIR=${XDG_DATA_HOME}/zinit
 
-[[ ${UID} == 0 || ${EUID} == 0 ]] && _ENV_ROOT=1
-[[ -n ${SSH_CLIENT:-${SSH_TTY}} ]] && _ENV_SSH=1
-[[ -n ${NVIM_LISTEN_ADDRESS} ]] && _ENV_NVIM=1
-[[ -n ${VIRTUAL_ENV} ]] && _ENV_PYVENV=1
-[[ -n ${NVM_BIN} ]] && _ENV_NVM=1
-[[ ${TERM} == *'-kitty' ]] && _ENV_MODERN_UI=1
+[[ -z $_ENV_ROOT ]] && [[ ${UID} == 0 || ${EUID} == 0 ]] && _ENV_ROOT=1
+[[ -z $_ENV_SSH ]] && [[ -n ${SSH_CLIENT:-${SSH_TTY}} ]] && _ENV_SSH=1
+[[ -z $_ENV_NVIM ]] && [[ -n ${NVIM_LISTEN_ADDRESS} ]] && _ENV_NVIM=1
+[[ -z $_ENV_PYVENV ]] && [[ -n ${VIRTUAL_ENV} ]] && _ENV_PYVENV=1
+[[ -z $_ENV_NVM ]] && [[ -n ${NVM_BIN} ]] && _ENV_NVM=1
+[[ -z $_ENV_FULL_UI ]] && [[ ${TERM} == *'-kitty' ]] && _ENV_FULL_UI=1
 
 # 外部资源
 _SRC_GIT_PROMPT=/usr/share/git/completion/git-prompt.sh
@@ -58,7 +58,7 @@ zinit light tj/git-extras
 # 主题
 autoload -Uz colors && colors
 source ${ZDOTDIR}/theme
-((_ENV_MODERN_UI)) && _theme_use_icon || _theme_use_text
+((_ENV_FULL_UI)) && _theme_use_icon || _theme_use_text
 
 # 与kitty集成
 if [[ -n "$KITTY_INSTALLATION_DIR" ]]; then