From 43a7867f5823cafea7aca75ca10d8e1e69b67f1a Mon Sep 17 00:00:00 2001
From: Marsway <liwei@marsway.red>
Date: Mon, 26 May 2025 14:34:42 +0800
Subject: [PATCH] resolve conflicts

---
 .bin/z.lua                                    |   1 -
 .config/shell.conf.d/brew.sh                  |   5 +++--
 .config/shell.conf.d/conf.sh                  |  19 +++++++++---------
 .config/shell.conf.d/tool.sh                  |   4 +++-
 .config/shell.conf.d/update_conf_list         |   4 ++--
 .../dict/PCPYDict/sgim_eng_usr.bin            | Bin 220318 -> 220318 bytes
 .../dict/PCPYDict/sgim_gd_pseudorelation.bin  | Bin 4128 -> 4128 bytes
 .../sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin | Bin 440140 -> 440140 bytes
 .../dict/PCPYDict/sgim_gd_usr_a_bigram.bin    | Bin 32132 -> 32132 bytes
 .../dict/PCPYDict/sgim_gd_usr_dca_bigram.bin  | Bin 118128 -> 118128 bytes
 .../dict/PCPYDict/sgim_gd_usrbg.bin           | Bin 640136 -> 640136 bytes
 .oh-my-zsh                                    |   2 +-
 12 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 160000 .bin/z.lua

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 1ceb7626bd09b877f4db9a2cef0547754167ff47..87a0cfbe349715c7261130d2c9c9dedbe90a70cd 100644
GIT binary patch
delta 640
zcmchU&r2IY6vyA&7&j>qG64}vp>>IxLsKKWhm@YA6q**ns)%^7E=99JjS{6rMQMAG
z($hwvDHMM|K`$cc92P}I#7jk?Jw(Kl2T{+(tKfGG_$RoBdEf7MKJU#iJGWjjw_d?D
zd45-E6VcBi)4~+fwhsnhAfK)m8iX@S#Hc&pQS(c6sWO<q|B2LQtc*$d&y@-xI<933
zq9&3|A=GavzU59kOZ&-wCO>j_0(GW}-<k*KrlXEL1Mp}*?kH{wLEnXWt1am6{gPgT
zj{7ZH9lZ|A>BwHYzJO%fr;=(h<8n+cj<pHhMS7s!r3u+Gdu;d{i>9N=`kh}!q!+-8
zqteh599VcQpF|BcAtWDMb%@|s0Oz<Fd++_cWE3JXj_N-UUTT)t5aYNAZooC^mZKHY
z&-ugS5!fx&fpHJ9{MIZ-y-WnU=g%{_x^fuycHi)(5$pmQ#%0(WAK;gwus_Kmy$xY`
z(e(aJ@+;vPE<a6W0`!Rnsh?~rr;pS_IlO5W$p~ezX5ogRb8uNo<DHu+05%8G#$U-$
kFT8R?pu-??$g}8Z1ewB28}n`SwaPCngmhWEuVp!O1EkH7t^fc4

delta 428
zcmbQYlXu=uUdCAy83RSb7#J94TxDcf(8kCR!VKg90o%lMeL+SbBcqam0Yo3@0umFK
zt9ybJT=>Mmzyzc<SQr^V{032w5(b7FYK#mVK-$29k%0?HcX%>_)jf!U$XnzvGOz%}
zC)5Jz$>NOO(rL4GGeB}rfP~C^2-^f`WWp)q&5A0bf}1A^9SPg4rXnLac>|-#=4DkO
zf}1xmJ`w=($~Fhhy`jWfd&)S2akKt`*-D$QJu(3)<JrvhB|>m}9xLM#B@lPIkOrg5
zb|(!+4Y2I=GE2q;PAQ;;hp+2pFmHct$#@-Pp2YS;UW|K`ws+++IzSYjs$=BY{-_Sh
Y-L5o&QO9%hBE}B_n?X*X6LF0n06aQ|i~s-t

diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_pseudorelation.bin
index 2a19f3dac5d2845fd87aeffdf1eb4b067811099c..ef56e526d0e9b5f4becac8afce362fa70373501b 100644
GIT binary patch
delta 20
ccmZ3Wus~tL0=9(=yNu*nH*U=5pIE>R08nTLQ~&?~

delta 20
ccmZ3Wus~tL0yaN}T}EeEHg3%4pIE>R08%~&tpET3

diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usr.bin
index 5262461fb1f1aa6e089ea754d8bd297f63bca066..5be45ac32a7ce29c9eab977a7f3097815daed25f 100644
GIT binary patch
delta 2079
zcma)7Yfx2H6#n+(9xjN8FOsVwp%ugM1Dt_TFvfJ$G6m&w0TWQXqL_%!Az^}xqe=M!
z+)kzg%=kc?5;V`yG^jZ}Y$nA=W~HKKI-2Q(NvWxot+Nm3kH7kHXP>pcy}tF{x1-C`
z(dDU&P8yNEIXer$Fc%QRfLRh~Xfv>ZbYmNU&p6OQXSK(GnF9oqKDXZ2*)NNP%p{<O
ztP5WR%DgI>#qoRDs(@YP-B~J)$M6eYRlw7@@~Z889G{b|E|T<9riu`gc^{uD5OGmc
z$^HWUo(%)8ya04(0E>t_F%~%CQ}2qX*Y10Pq{+aZi9mD^;CmjJkPQr^tIG!ipN;@Z
zlZk@PzcYc7p%f>bNdti|h_a68e1s2k1GfeN%Scx_3^?Fbk3<ZQ%~l@i;jKP3QcmP0
zK2;{8`0H8bW_gS844<knl6j<8wHl|41PZi&mZ}JvY>c6xW_Z=-LEHPq`^e8!pf(y<
zOeHy=t>(GALf#^E?KB`PM`Z_Z3fW2#Gpg`apSlsejz96K(vTF-Zek3L0!C6U-IIWW
zX~2=bz~M~Q9ugI$D2?w@fHy}IMCYhfpelw^q^pTJ=G~CAdezY|TqYpGW&Y7n$0WyD
zY1TBI4Uz(vrOMwEIXDDi)LjP7QO?}ph|S^HCW6t=W!CTM!$c@9s9k%rWEiB&e7sk<
zqye}TZ<#9u?yChYi9{CZGMieq29bj(mm1xcASDfrTGY0hG`~yp&$d@Nech4f_)lK8
zz8*+b+a5_wx1`$F9#7<k%e>UShzW`B%_)cTm~>&F%iMRQK9t=2pvE3QM4G>(`Q$ja
zqVJNX>+A+j*lBaixe2|=VSkr-`R6=?RFBOuH-`rW7*5i_G6*+J_91(pHL?M4;|(lE
z2@2_}PTa;qVO=?8Uo>!#?O?4e90tlzgk^NriVRc=hBNvKmncOlLLrek%U>*!FH*_=
z8wXsA77acsI1#9jutbJ$ZPdU-7S9r3v7hm$l%HJhXn=DLK`Gm$36Or>OTI|rIR7-*
zm{IDtL55BT48u`v84+MBCBhImO0F+C=nVKZdg{F~6tyKW{Ah!2yn_bhuvA#(Y4%_9
z))e`REp4%=7g?116^CUCmM|;#hcmYnNLUiXRR>(t<KoKnxO9m%0TO}h4mz8aYtxn9
z%329aVz}`%xNUlDjtv68I$$;2+H(B7LsSw=Vz}*q$9kNeUT8VBB!;^h3{bCnW0E#K
zHfv$7EirU!l;(OrJ3zf|W*@L!YzP%+IaW}|7f^%ele9|Ih)UrXOGQ3a;GW~pa_^=J
zeA$#jOAb7AfS0gNyGqCzODT{PU>w2rZb?-1<gl|Ug>tYYhJWoq3{)}~3(`XunfYM-
zxDrPLJaO1Zv3%XWA#-cXskS1Y(qs<#N7O1SrnTwU-qE|PfdI{YBPF<_XYLCrxgtIH
z^up0l>(y{5w&J4ZzvKO<TEdbTTsFwDn%Fra=2%}GZmp(8ZDu=l#tSfyocqNLs#Ay!
zy3xu4JJ>#2J8Pya$4hAK+}d#&tsT(IalH`*nkF&t^fZZ$*i1B`4!8zI8vLc|w<^k;
zB%qJ&Bh>0VwXl)gH0uV&r6(_4L8YIDS16f4z6fPC!iE|8+E(G%MKx)praP7+Xd&lQ
zh=tU6$2y$$x{_Xor8ETe_eEpCFu;kanmwmuYRZkyq<JKX;TZ=UfLz^+n{@$$-e-nE
zwqJvKVUk~K`3va{Dx{PCee~<&ajtyK_OspkN(D`0F<sdvR*Bi<e6Yjc8((YwK;6{o
z7X1(#FtCaqi+FA8$!J}_d!`ZBqhc89+^NAj%+Ys@yw2JwZyT^R^k30gf3R1_|M-0s
F{vY{cnp*$>

delta 634
zcmb7=&r8#B7{}kAAKQ2ORikK<(`07o2#Xvormh&KZuEmnW?l3Ubje&r9V&<jIwUci
z^9f2ALol|ByYyipGrKGZWJE|_%D_5}4kN5i74_JE(Bb*KAKuUBdA~k<%2iLf>Y4Ti
z)}k}#VgSk-*dc&M)~SjE3HHKiU{>;s^`6HG8U||EKbso);2aJB7miTB*hkmI2F0Y8
zZpjcW$}s(64XG$iDqlle1F+EvY@P<Xee_1P`UA&->=59!fRPTs&7&L5z{|bBmBT<A
z>%?wGF)rW+N}Y5-H&Rr4X+rO!Nj*Ssb&L6`D}vUYhiIo&rivA%pzBF(=@gLk0#^g{
z*;SRvGxWY@N(w>OYah<o!J)cVz|XwR2=MGEu)G}@SIps}0l?z=9Ri;FfxHh`>jm!g
z@LkqmA8>aMzb#@?c3+C-?0G7u+x32wwE32v7Fxg!^B}WoX^Ag_#<ES#E?68bASG@K
z7bJY=C1#Zq4rNl=Z9>^tqWN4*+qkLC&zy2-2gWqX{6!@Zp-cI04!bN(CjZ!CK(C;l
z!a=Ptt|?x)&(5GQ-wP)scX45kEk?JxgrH=xiIb|57K&ZE9zT>>FUEyZcx6t$7!_J0
zsm;Q2s*W+QDZH}8Yfq*5vm&=Jwla>@gydPyJbE`+&%lf}A3u#cl|a7<Robn8pJ3+f
LuGD`V9W8$WeQK}x

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 5341b245564bcc9eee36c47d9341785e533eb01e..ada9123e57e233665c4f7926cc4bfd42d8eea72c 100644
GIT binary patch
delta 819
zcmY+DO-NKx6vzMP&iEYXE2ri?BPgUrgni&FbTNT}imlZApeSuBCPiCJP&%dHOwm9K
zF&*C`TFgSx78V)~v}sXWq0&`Un;-~RR(k{c-#f2`5AM15o!>eCbKbeU!mbo{Wv>3r
zV_&wdAHZP&o^mg6ZB+vwxc3Ku#&IBC2k?l&V&?^G#|CDd;(SV-a*Dr_%C_AT(tJGX
z0N>+4f;#7;KsE$C2?KjvugC^$HzTcQfAH890d7|TV^lgo{3iyy4+1av-el3w^zB+;
z#&$nRi`sMCplS$SV`iH4Z`^HGt*XU#v+9_7XS?&NBic@QmDRscBI~%{RIl1_$_>8H
z{&IidncpvnOZj)Wy*4lKu|ow5Sq$MWLOiX@f~?XD0V4_h=)ImEso|c%Ir<5z3<%S4
z2V)qe%^-#_R^+9;mSx(Nih^YVEo`Ne6CbCwe21KtMy&!=v%b+s*UvtqFM8;F0v;%J
zXVUvXjRzj|P0ea>Lni3q6ZF9Io|BjNfshB<hTobR4~;l8!h$@jD}2pW)85i5f`|zZ
z;3lUrL>u8<mpG3FDd|Fjs0pyphfC-(16z~z%IER|y<(#nhVEin7IhX->w(2w(sVIt
zy2z8nJdzmPyr@%VkgB8{^uTs*C#OLHLmCJU8DO!w`&@daB`N=J&-UOX?qS5hH?k&6
zl}yJ#Kk{>(JzBCUf(_lBpw3G>(!DypG@vyfA;X(8Q2z~jP*Yd*pvKFIqxGqO{F8WD

delta 185
zcmZqq&Diprae{)b0b`kS2m=EH6C(pd6Oe8J;tT8y4BLTp2nPd$K`8^neGvu*Ad?|@
zqObeJIWZIeSWLEHG!ZfcYO&{IU?}5eU})!IVEE57xsTCF&X1RYA&ZrPfgdRJL6Cvr
z02c#;DH{Vr2~g>Cfyw_E?It@gX)q<TO)g?`n!JNaX7UXt7p5qY$y&@on;V#~uuQ(d
f9I`otV>$~9&>)7*?|EDVHkZf?#BIL7?8pQF$=NK2

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 8a4fd4486870c13f9d3e82e77212133d5c2fc2f5..dd46e564e6d5a386aee3d676217a794d386653fe 100644
GIT binary patch
delta 5734
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
C1}Y^0

delta 647
zcmWkrQAm?v6g}TI_s>nXf19JVO`Br4pM*p)GNP3kXc-7aSXqYo;6tF8WRg)(TA;|>
zO%tPNlC)~m<O^0%2@zpYl(2fRheismR4|HsFsSRp;hgVWxc7eNE{`b7BTC4x^*!&Z
zI0(R;30!1W3xS;`AjF&+6L^^+U}V2^p!$HV>^cx12A&N8+As#*yC#>n3gv|Ws&tS+
zohGPV-$$yUS#}v>f{KiR-7WV3&qKiU71%Wae0%_;$AOw|;1qjR4#0XEn2!R#?7T@k
z*Lr|t8}NkjE()43=26lZ2rJp-R*G!<_ws@zK<x<deIBww*&`@sx=J;fv9Q@qesh8I
z(;{$q3Fv12r}6kDP=`69FRcR=T4u<Qm6D5D&BEIo2NWkT7h`6e$p`M91xD?lb5_kc
z%kQ5@fSX?66(><4KvUKnN?Thke|`WB3&58J$PQbXpvP)u*gj2f?M<}ZG41T!2b6m_
zu=T*y4o)`+xxp!f<$fcOe-ik84HV3tv{iGWGlM*w<32VBvbYB29apoE>bgonC){0%
z_7~W;3c29cgsr3%xU2#fm}}cWn>`Uqdg`dyn<k$xKvj%(U$Kn(0)iHE{G{f(Wo2%G
z&XRYWPuB!Qnn0KQ)s_{$NG{{`IOLpvOlLj+2I#HluO0<T>JuU;97Y)`9JLz+dLg%z
z4>ht{(aR4v9{Ke;=;W2Bt2u0KG|HaYLz`ILRuZWUp|`ShnG)ZeqJK@^G9^0m#b@(c
M%a;Cx8WeH+e`h7ON&o-=

diff --git a/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin b/.config/sogoupinyin/dict/PCPYDict/sgim_gd_usrbg.bin
index 7365123a7d4e2524862cd6421ba73e62b3ad41a1..c60e77d3b09028c4272aabd643770cb3de085c8b 100644
GIT binary patch
delta 5865
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
VbdFE{1Xi#jxqo2p|K-uV<bUbIRZ;)|

delta 623
zcmb`DO>0w85Qg8=dvo*cjp<E{-Zq3#lc+%|Xb_bWP$ZOEsR#y)G(r&-!H7Y$mJ-B8
zs+;JPQZ<NZDHXDaIclq*hOUAxtSBXmT8gf8m2O0^3#S`@fd`&>5A${AOmQq)9E+Ah
zyHbhUsp9~)+Su@UrvXLQWEs$`K!dd&wIdl4SWnsiY`_$h6NdlgW1#y9Ffj*wW9B{r
zivc+=62dvs2E1hq1*9uKXiZ5|Rvn@RHANkkl-}qEdX92U9{8PyylxSK3R;Y+T8Nrj
zCK_A?R{j9v=Xi|sfNBC)81)E{Wx~@On})n--6m+tc7eL=;~TE_0>7BX7J+>xE!uaI
z;V4kqQKXo&gZiA6n#(2hGp{*~@kW4r1Qd1ep{(1W5qF#_?!B_*wu!rXxAWl=;P?t0
z`vf|u-=QVFkK&$^ta}VWD;wkF@#d)LouS?BX)3i>WYXY3#+RcnzBOw47pS^viZX#N
zc{8Aj9h0WO&-;M?0Wg1>c@6|$@XjXLcaQhTnjPkS3`2h3{6^4>nUpQ_EVt}zdDAZb
z@G>wo$b)Br_k;3M@WiMr1V0PeDBn=jlXzv7{f}xkHG!BW)u%mnRbT@0aIMMj<B*Wy
q54U>xc1@YB`b0gVw4rnM@&O@3>>RbsZa*cK|Fuo6_x?X-HT)M_jK8G-

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