From dca680417add4b592da91877e382337b09a0bd09 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 2 Aug 2023 21:27:01 +0200
Subject: [PATCH] Improve w530 bookworm setup.

---
 bookworm/apt-mark/.user.swp           | Bin 12288 -> 0 bytes
 bookworm/home_files/user/mail_sync.sh |   3 ---
 bookworm/setup_scripts/setup_home.sh  |   2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 bookworm/apt-mark/.user.swp

diff --git a/bookworm/apt-mark/.user.swp b/bookworm/apt-mark/.user.swp
deleted file mode 100644
index 29184c94245f6e9eb723084f0bcb50e43b5170b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2y^AD87>D0A^gO>#kjv^E(B%4hXV$~zRt+u_y-4oZNUiRw?kT3bs;G~inG4oL
zGXo6-KLQgm5cEGVG7v5`GZDdH{{S&k@K-%EvM0iAB%IX1L)Ug!z5TvVy%P*u)&8B=
zZn48_Gs5RdqT#c9;=89xqE8+r+nGMye$Zz%o9#bnPI`Wl0+u#bovPn<(i&gZMmMT0
zD`OT*<NA`@Q1sj_%IKv#Ps}_g8^{LEVIYR4IJ`&)v+4L<ojiAiU3&WVITq$A*+4ds
z4P*n^KsJyKWCPhiHt>Hj5bPeki(($x7Id_|?)~Gs{WD*(fovcf$Of{3Y#<xR2C{){
zAREXAvVm;iAvC}R(ZL0xqsNdu{{O%G{r~k7L?43>!TTVB7Q6s1gFSHiIMEN_TksKh
z51arGI5+}V!L#5QZ~^>rk?41D3VsDYgP*{U;2!uMd<nh)pMtx<fVaR+@Dg|)TmhHC
zCGaP5{|%giU%)ruEATn^0Gt318t@J{2Csuxz*zS~xNkY-Y#<xR2C{){AREXAvVm;i
zKQ=HStF+X?t&27+W+Xey3vEIl>pAVN%CB`z6V`LpF)u^3R2kP+yk1~9VU2MtO;Nff
zW2N?fUeujJSgPIHhRqV&n}|CT77QDQOzQEm6zuk!H<=HrUNEi&!?|Imf@e5b91z4)
zCq;{+#A9;1anEaC$d2SVs7>D+jm&i+8sBd2;$7oYs-yLr7pKtHDa3VTW9KE0LYZw1
zjdHRvtCXPZRbU<o3+hxQs_2UrgJN3D(hayO4vPJ>Zo9@stx-P{5&{G&Q_@p)SJ@dY
zTbat<%~aY4-gWoSw9eGXvFF<I7Ar9*M1{h=Cm)5OLG_5iJ8zPnCU&$!4Lu&#i!`eU
z#&n+40fL8^2AIB7T9_p~56T(crwu{!miL8U`yhLf(n^~bxC>+5C}X^nL^@+adYPlu
zbXu%17^Ev=P<YQ~-O3@ymC|ag@9#jgo4Z1n6iV9|@IsAq;i~rk_D~K&4v2Zo#>qF>
zLar;rofz987&N2BkKFsh4oXOa-~m0b$>un1+*k_Z0jfGe19{WQV$*==yt(q&ev{Vv
zO($atTh3KIXHIhASt&zZ3fb`3g><t0%=)F}K3a=|?;Ikv3^?t+z)5$F9dp|pma0+I
z4gKs)=OalK9PgWL5Awk%!EjtYq=rE{RVRCo%?k4~Ux_#F+`5VsC3|@ug7r7blKVxh
W@D+;J(CsBJr_=rGhc6z!N`C=m=b8op

diff --git a/bookworm/home_files/user/mail_sync.sh b/bookworm/home_files/user/mail_sync.sh
index 7d96256..ffe6b4a 100755
--- a/bookworm/home_files/user/mail_sync.sh
+++ b/bookworm/home_files/user/mail_sync.sh
@@ -22,11 +22,8 @@ for tag in $(notmuch search --output=tags '*'); do
     fi
     target_dir="${basedir}"$(echo "${tag}" | cut -c5-)"/cur/"
     for f in $(notmuch search --output=files tag:"${tag}"); do
-	 echo DEBUG0 $f
          new_name=$(basename "${f}" | sed -e 's/,U=[0-9]*//')
-	 echo DEBUG0 $new_name
          target_path="${target_dir}${new_name}"
-	 echo DEBUG0 $target_path
          if [ ! "${target_path}" = "${f}" ]; then
              echo "Moving ${f} to ${target_path}."
              mv "${f}" "${target_path}"
diff --git a/bookworm/setup_scripts/setup_home.sh b/bookworm/setup_scripts/setup_home.sh
index 8a8b265..3dd502c 100755
--- a/bookworm/setup_scripts/setup_home.sh
+++ b/bookworm/setup_scripts/setup_home.sh
@@ -94,7 +94,7 @@ if [ -f "${authinfo_file}" ]; then
 fi
 cd
 
-# rm -rf "${dir_secrets}"
+rm -rf "${dir_secrets}"
 
 maildir=~/mail/maildir
 # # Set up e-mail system. Note that we only do mbsync if the imap pass file
-- 
2.30.2