liwei
/
.vvconfig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
Marsway 2025-05-26 14:34:42 +08:00
parent 54df8ce397
commit 43a7867f58
12 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bin/z.lua

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

3
.config/shell.conf.d/brew.sh
View File

@ -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_INSTALL_FROM_API=1
export HOMEBREW_PIP_INDEX_URL=https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple export HOMEBREW_PIP_INDEX_URL=https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
if [[ $(uname) == "Darwin" ]]; then
eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(/opt/homebrew/bin/brew shellenv)"
fi
install_brew() { install_brew() {
git clone --depth=1 https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/install.git brew-install git clone --depth=1 https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/install.git brew-install
/bin/bash brew-install/install.sh /bin/bash brew-install/install.sh

19
.config/shell.conf.d/conf.sh
View File

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

2
.config/shell.conf.d/tool.sh
View File

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

4
.config/shell.conf.d/update_conf_list
View File

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

BIN
.config/sogoupinyin/dict/PCPYDict/sgim_eng_usr.bin
View File

Binary file not shown.

BIN
.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin
View File

Binary file not shown.

BIN
.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin
View File

Binary file not shown.

BIN
.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_a_bigram.bin
View File

Binary file not shown.

BIN
.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr_dca_bigram.bin
View File

Binary file not shown.

BIN
.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin
View File

Binary file not shown.

2
.oh-my-zsh

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