diff --git a/.bin/z.lua b/.bin/z.lua deleted file mode 160000 index 4bbd0f1..0000000 --- a/.bin/z.lua +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4bbd0f1e5889f2755438952785a11b7a8222f696 diff --git a/.config/shell.conf.d/brew.sh b/.config/shell.conf.d/brew.sh index 9b983b2..31f852c 100644 --- a/.config/shell.conf.d/brew.sh +++ b/.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 diff --git a/.config/shell.conf.d/conf.sh b/.config/shell.conf.d/conf.sh index bd88da8..ea25978 100644 --- a/.config/shell.conf.d/conf.sh +++ b/.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 diff --git a/.config/shell.conf.d/tool.sh b/.config/shell.conf.d/tool.sh index e0f4b25..2e6b4e1 100644 --- a/.config/shell.conf.d/tool.sh +++ b/.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 diff --git a/.config/shell.conf.d/update_conf_list b/.config/shell.conf.d/update_conf_list index e8e44e3..cf0822c 100755 --- a/.config/shell.conf.d/update_conf_list +++ b/.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 diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_eng_usr.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_eng_usr.bin index 1ceb762..87a0cfb 100644 Binary files a/.config/sogoupinyin/dict/PCPYDict/sgim_eng_usr.bin and b/.config/sogoupinyin/dict/PCPYDict/sgim_eng_usr.bin differ diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin index 2a19f3d..ef56e52 100644 Binary files a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin and b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin differ diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin index 5262461..5be45ac 100644 Binary files a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin and b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin differ diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_a_bigram.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_a_bigram.bin index 5341b24..ada9123 100644 Binary files a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_a_bigram.bin and b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_a_bigram.bin differ diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_dca_bigram.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_dca_bigram.bin index 8a4fd44..dd46e56 100644 Binary files a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_dca_bigram.bin and b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_dca_bigram.bin differ diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin index 7365123..c60e77d 100644 Binary files a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin and b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin differ diff --git a/.oh-my-zsh b/.oh-my-zsh index fa396ad..1af6bac 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit fa396ad7718af77e896472772bffd4a7e9110193 +Subproject commit 1af6bace7b05a4d25fceb9006cd37f68d17141c8