resolve conflicts

.bin/z.lua

@@ -1 +0,0 @@
-Subproject commit 4bbd0f1e5889f2755438952785a11b7a8222f696

.config/shell.conf.d/brew.sh

@@ -5,8 +5,9 @@ export HOMEBREW_CORE_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebr
 export HOMEBREW_INSTALL_FROM_API=1
 export HOMEBREW_PIP_INDEX_URL=https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
 
-eval "$(/opt/homebrew/bin/brew shellenv)"
-
+if [[ $(uname) == "Darwin" ]]; then
+  eval "$(/opt/homebrew/bin/brew shellenv)"
+fi
 install_brew() {
 	git clone --depth=1 https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/install.git brew-install
 	/bin/bash brew-install/install.sh

.config/shell.conf.d/conf.sh

@@ -1,10 +1,9 @@
-source /Users/marsway/.config/shell.conf.d/brew.sh
-source /Users/marsway/.config/shell.conf.d/flutter.sh
-source /Users/marsway/.config/shell.conf.d/tool.sh
-source /Users/marsway/.config/shell.conf.d/aliases/crack.sh
-source /Users/marsway/.config/shell.conf.d/aliases/editor.sh
-source /Users/marsway/.config/shell.conf.d/aliases/git.sh
-source /Users/marsway/.config/shell.conf.d/aliases/mc.sh
-source /Users/marsway/.config/shell.conf.d/aliases/quickpath.sh
-source /Users/marsway/.config/shell.conf.d/aliases/quickssh.sh
-source /Users/marsway/.config/shell.conf.d/aliases/scripts.sh
+source ~/.config/shell.conf.d/brew.sh
+source ~/.config/shell.conf.d/tool.sh
+source ~/.config/shell.conf.d/aliases/crack.sh
+source ~/.config/shell.conf.d/aliases/editor.sh
+source ~/.config/shell.conf.d/aliases/git.sh
+source ~/.config/shell.conf.d/aliases/mc.sh
+source ~/.config/shell.conf.d/aliases/quickpath.sh
+source ~/.config/shell.conf.d/aliases/quickssh.sh
+source ~/.config/shell.conf.d/aliases/scripts.sh

.config/shell.conf.d/tool.sh

@@ -1 +1,3 @@
-eval "$(lua ~/.vvconfig/.bin/z.lua/z.lua --init zsh)"
+if [[ -d ~/.vvconfig/.bin/z.lua ]]; then
+  eval "$(lua ~/.vvconfig/.bin/z.lua/z.lua --init zsh)"
+fi

.config/shell.conf.d/update_conf_list

@@ -1,8 +1,8 @@
 #!/bin/zsh
 rm ./conf.sh
 for conf in *.sh; do
-  echo "source $VV_SHELL_CONFIG_DIR/$conf" >> conf.sh
+  echo "source ~/.config/shell.conf.d/$conf" >> conf.sh
 done
 for alias in aliases/*.sh; do
-  echo "source $VV_SHELL_CONFIG_DIR/$alias" >> conf.sh
+  echo "source ~/.config/shell.conf.d/$alias" >> conf.sh
 done

.oh-my-zsh

@@ -1 +1 @@
-Subproject commit fa396ad7718af77e896472772bffd4a7e9110193
+Subproject commit 1af6bace7b05a4d25fceb9006cd37f68d17141c8