From 823150aa4326ad47335daa698f1cc9e1d20d3a65 Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Mon, 27 Oct 2025 23:36:05 +0100 Subject: [PATCH] vdirsyncer revamp --- .gitignore | 1 + .gitsecret/paths/mapping.cfg | 1 + homeassistant/SERVICE_ACCOUNT.JSON.secret | Bin 2246 -> 2249 bytes khal/config | 12 ++-- khard/khard.conf | 8 +-- vdirsyncer/config | 73 ---------------------- vdirsyncer/config.secret | Bin 0 -> 1299 bytes 7 files changed, 12 insertions(+), 83 deletions(-) delete mode 100644 vdirsyncer/config create mode 100644 vdirsyncer/config.secret diff --git a/.gitignore b/.gitignore index 4fccb20..7ec83c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .gitsecret/keys/random_seed !*.secret homeassistant/SERVICE_ACCOUNT.JSON +vdirsyncer/config diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg index 285a61f..c9b8a83 100644 --- a/.gitsecret/paths/mapping.cfg +++ b/.gitsecret/paths/mapping.cfg @@ -1 +1,2 @@ homeassistant/SERVICE_ACCOUNT.JSON:5a3eabcbc53278f7713423b0ea20d0558f6334f8a1f6aed2a2e4cfb2ca9c93ab +vdirsyncer/config:4858db17e53be276ae7dbff5492f039c316652bc624fe079891b69f6988306b0 diff --git a/homeassistant/SERVICE_ACCOUNT.JSON.secret b/homeassistant/SERVICE_ACCOUNT.JSON.secret index 1ca858ba2ab851b6a54334ae71339de09c5f574d..74fcb6a40f358670d6681048c311513affab8d7e 100644 GIT binary patch literal 2249 zcmV;)2sZbH0gMA{hqi78NQ7wt3;%bK=p~i8D_aGaJZdry6bV;Z9${CDD9XpFIgNHD zJ?PZbQX?BX2sVn!b{*7psCs5nuwIoJ>B)Jwi;ohJV@wH^bzVVz#Dq*55D)oeDsTNf zOB)S)ks$h+MAIX^jtQL^8%R=;zz7w~i7xs!OD0=5wYF&twhyylFnZXCAewef z$HlgdOHFQgzyH=pX_1QXrQ_yQf-t?kPRcs?k$U#fzI2la=??&Y;tSRHCp&2f^ac<5 zxutD6*ArURFU}7B;T=h*U;IbxLm#{sKO;YoEtu8Q4dj-)rxHLiBqZ0keHfoQYSB;; z*KpVxpN1P5V?Y?RtX>sbHoo!GTVHXq#?mXvm(GQ`UwE_yk|O5)g5{|-yGstgV}nzM zenlx!C4IgLoIo%WTf=1Ta*}Hw}S~qngF=)|_Kc z$KrDXKJOyr7>_agh^HfES(SXq0K|&+qxYiv3zXs~^Vibq0X@5@RixK{ujk2*-o8_c z4Pp}^|Ff;%aM6S2$J5MLTy^ip#oZzr2ca+v+^^l>VaU|S`w^1cZiJ8 z@ncg3eR>1#=D2ZirmQJ+UFBpw!D^o3S$j1j5h)ILOcVd*)9}s6FIG_Pf{PF8u9140 zWx+TLiCE!Rn1rp^U>z1%B4fVAO0@@zfb zN*q-5Awp@ea}uwHy4Y!18@Rc0;nzfX?A*Ti4-0<+S)1{rA8jj-9$qBBp6u#qMzz4| z{_f~4UaJ(oP$F6)dz)S3ZfuYs!GYV~4P%|*CaDHZ@DTO%xh1ib zET4`nM||Mp{lm4I-`@3|Z1u7iZ;Y;l`UCkY-3~51%@})bjrBHt-ot+oC4gWg4*NWK zsnXT4mD}{1{HueVYeOSkLixQeaN=Z_i)lJuCE@~CEI~X9Sp`=HM>k4TbP63Y0Lv0vQW?3@3l->FC;mB&YM7q`fPXM)3AW3!(c;$)JFe$3Ul>J2<_6B6S9b*%0)QZA0g z-?$1{?r|dq%mqrwNb3 zMy(Bd9DSZu-y&zkHL@jBK|dgQR&c@g;%tV!)A6JmyMH~YvUx;F42S`YEL6a zzP375gamM2`l9n%md`4!R{Uiwki!v-TsdA7=TPnykYjNs7E zSR5l|CnN5;ETzp5CHl(;9$B?PQI?$CZqtp7;j6QtG4cC0Vj^MHN8(!j~8TdJp zD#qD9JFTQTnX2llsHq!ii4d~K@6)eMr*rgCHkY?yJfr2=(8!={E*S8mRnF8*a69JE zD0Y@>Kv>8OW`mG&q8g=bB}R)tag!i0GiHwYir|JWFftjZhy9sO;=BP(!w3k%W#jC_ z@NA4cG}K^oxn1LHtP^?*&yfwFfm<;)QKuMCF_37w8J>rj-1k2Z7IqoJ>|`#Yg2;Xo z?L5wYn&WzHs^*`m@dd(yz$Ox=SGMAfG%!&th)@lnI1)^krOT4aBhmpVekLV`U%yil|xZhOFl;%z@KJqveP(GoXV@yy6iJ?`9FuPi-GG?z^&OYmw3<h;OK#C15Z zxmGr&4*w82B_-C`hA%xReSn@|+I+3=?UIMF>QAJ{Q53_)h}+9ul0{MF>)FFOt3k!v zl=obrmJ-G{ZA>aVgSL-vOs4=Dn5n3;R?@ObJ_jDKf7x6A2>#pI7{)LLA7-CZ0{>kSQLs>#^_~q!55Oifo9VHe)J>)4B5T0ipSPmFzC9n z^Si!d=#026MLV8i3&0h4ZX&2$`k)V=wbO~c*sV|Qf8)8BJvoO*-;ty;|8<)jC&eSgQrOFlJ+%OJn_Wzv+K|jwwjsN%uh#GEuYT94>5P?@i`|X zbC2gFnB=F9T90nldbYcWmryQn6Qe}r1{T?hdQ}i literal 2246 zcmV;%2s!tK0gMA{hqi78NQ7wt3;#~AF4i@(QH_lG^wL%@FjSn&m^gg<+K8?be{;M=Ut!CpFiW>dz|rI%OGyH4+|TN zt6rE3?s&{>#00p71^z~cBKEAiLffMdUTVnPY>|AnN0wy)PjNnsrmnV&&T{vL^@a-N zxxV#-uuXxu5aIA>y=4s~GO}J>r%8O}LfPY58 zm{AkR&iTSgX_Rf9;~!mEbp3mN`!(^?5Qp#$dQL%8*c6C{=(_}f&_of3MAiKbehR?N z@4PyJHr?5_G{ZQ3@?0ee0cxMRZDYUtgZpoP+MNypcptiM@RGdM<+U$}_lHt2K>QqS zfHGjtRT(x*0^0lS@x?4Pc8dZ&pGpVYnrL)+$Z2IHj!oK{Pbp!9-%o^I1H|Pzj{g}f zz7hckKww{rilm&)| zkMr?-uOBx^4lw${d8&uXlyYTC%=tyd$nO@XbF?O8heOip0m`cdblYnTD+Mt(rDCW& zLK|M)oNes=A2xT4<6lOZFEe%WcmAMk@a~FcR-seoCUQzb5fW)ZZfDWN$T;_!xpuBB z+_Xn9dn)aQ(0L|Jl?SdCCCI@Ep}D!e|1bFas|QV#3!uy?Kg%v4 zY&l`ylcSW=RtUjA6;ZGmtAsSc@qTeFl-#4vH-t0%_{ipyg(1iC0|iYwxMj;u$jkWe zG{P?sQ{V|!zo_$_F~y!a-OkWqsNkZyPY#Ds3M3uflok}8fKSk)+OJZr@8Mj z!oPyY3NS9M;ZY;;4VmG0@7C2G^Q@0=p}pJf9c7 zeP0ioNIGW!eV1ZC(j);1RN4)30C$(7*42Q)zo9h~_YgTjfd6DIwl-dmhKsSmX$Mim zuQ_J6vc#pJm9T~Kown6zGH zy%U>))svBnI1EMJ@fH-JxS-HE%%(Fqgesg1AMq}cHtWPDERpY*cMnB^Lh2qlCCE=x zawgh#ypSeXG4{E&ey&uAjN>H~g;Sqw6ogb@^NfP@Z0t56@~JlAVvtX-g)vuaX4 zw$uIhj)t5qY?`g^DDuUiMiX;s7JUP(a3I|*h7PmilecvP!8nMxE~kb{#~%qbkTg*w zh>-uTGK@Da8o^=%O1zmq(2kn|>P5J+Si6UmxAO))667Aj>PrHYYBxB#&|y5iXRv4& z`vGM{5!+^5NP*?9WpJ4FEESK$q8~s6aZ`iGg)R%;^_vFnLKEOR?*)f=`-=ZjaR#kh ziIGPKVT2Gnb#+gbBOieKWDq_oP$;}mJZoYZpCEbQ#e!x-XUQ#`g|1lf_&%d4VqceER?bg~3QQ(Yfq z(81x^M&vscOurczMJdHWU|i49b;%@IQGwYSJFrp%UL(7$|Cd{cwHSZ*hX#*cfCOOt z=e%M|`&$B^D!x`~?Tfj74L!g|%-I=TYgZtBlxUmSI#hrDlM^-%`8Q1Sjk(q~w|IYQ zd%}d?=m>OC2iJhjlgHLN4Z}lN=`dn|@J-qfdgo7tyFOP(r<~2*vOxO!C&<}lO*65} z#~bJgB?@MTj;C*oj16rL4PGBc2iuB8|merShAv%+WO3W^?zKi_<4PNUQjp9>CV{e61PKQdsh~%cw z$CTDAt0spX8C@N;SZmzP@5b+Rj(*?zgmotKbSfuOLb__IF_RqyQiNERd`|IBvz~MK|#LG|4;dZL;Od&0&P5!X}<5^x@ zU|)00N1>PJ>3RD+K3)2||V z_7P!g;-qTi@|~`kw{P}W2Sh$fso3A+Sp8!8f6Lz!^QQ0qk68LnZ#OSyWy#eO0xL0! zRlLD^N{*$Ceh7Nn$G{RDUt0DsQb(bsXQ6MD7N1}%xeIv(iqOMOtnyFltFPJBJewo( zpC;tTj~f#X`Y5x3$b(*E U1h}@PVaL=^4ZR9nso&h3S&|=MCIA2c diff --git a/khal/config b/khal/config index 034e4a6..7a99960 100644 --- a/khal/config +++ b/khal/config @@ -1,6 +1,6 @@ [default] -default_calendar = purelymail +default_calendar = henrik@hjarl.com highlight_event_days = true [view] @@ -16,18 +16,18 @@ longdateformat = %d.%m.%Y [calendars] -[[purelymail]] - path = ~/.config/vdirsyncer/calendars/purelymail/ +[[henrik@hjarl.com]] + path = ~/Calendars/henrik@hjarl.com/ color = yellow priority = 10 -[[google]] - path = ~/.config/vdirsyncer/calendars/google/bakken.henrik@gmail.com +[[bakken.henrik@gmail.com]] + path = ~/Calendars/google/bakken.henrik@gmail.com color = light magenta priority = 5 [[holidays]] - path = ~/.config/vdirsyncer/calendars/holidays/ + path = ~/Calendars/holidays/ color = dark cyan readonly = True priority = 0 diff --git a/khard/khard.conf b/khard/khard.conf index b387f81..fce82df 100644 --- a/khard/khard.conf +++ b/khard/khard.conf @@ -1,6 +1,6 @@ [addressbooks] -[[bakken.henrik@gmail.com]] -path = ~/.config/vdirsyncer/contacts/google/default/ +[[henrik@hjarl.com]] +path = ~/Contacts/henrik@hjarl.com/default/ [general] debug = no @@ -40,9 +40,9 @@ preferred_email_address_type = pref, work, home # example: # private_objects = Jabber, Skype, Twitter # default: , (the empty list) -private_objects = Jabber, Skype, Twitter +private_objects = , # preferred vcard version: 3.0 / 4.0 -preferred_version = 3.0 +preferred_version = 4.0 # Look into source vcf files to speed up search queries: yes / no search_in_source_files = no # skip unparsable vcard files: yes / no diff --git a/vdirsyncer/config b/vdirsyncer/config deleted file mode 100644 index 92e34f5..0000000 --- a/vdirsyncer/config +++ /dev/null @@ -1,73 +0,0 @@ -[general] -status_path = "~/.config/vdirsyncer/status/" - -[pair purelymail_calendar] -a = "purelymail_calendar_local" -b = "purelymail_calendar_remote" -collections = null -conflict_resolution = "b wins" -metadata = ["displayname", "color"] - -[storage purelymail_calendar_local] -type = "filesystem" -path = "~/.config/vdirsyncer/calendars/purelymail/" -fileext = ".ics" - -[storage purelymail_calendar_remote] -type = "caldav" -url = "https://purelymail.com/webdav/22216/caldav/A44F971C-BC2A-46F0-9992-4B490A8DB7FD/" -username = "henrik@hjarl.com" -password.fetch = ["command", "pass", "show", "henrik@hjarl.com"] - -[pair google_calendar] -a = "google_calendar_local" -b = "google_calendar_remote" -collections = ["from a", "from b"] -conflict_resolution = "b wins" -metadata = ["color"] - -[storage google_calendar_local] -type = "filesystem" -path = "~/.config/vdirsyncer/calendars/google/" -fileext = ".ics" - -[storage google_calendar_remote] -type = "google_calendar" -token_file = "~/.config/vdirsyncer/google_calendar_token" -client_id = "46299105873-hli2csm2rdgmtdnobmbsdcquajceli76.apps.googleusercontent.com" -client_secret = "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" - -[pair google_contacts] -a = "google_contacts_local" -b = "google_contacts_remote" -collections = ["from a", "from b"] -conflict_resolution = "b wins" -metadata = ["color"] - -[storage google_contacts_local] -type = "filesystem" -path = "~/.config/vdirsyncer/contacts/google/" -fileext = ".vcf" - -[storage google_contacts_remote] -type = "google_contacts" -token_file = "~/.config/vdirsyncer/google_contacts_token" -client_id = "46299105873-2do84a5do8bc9j6imuerte8u6m1bsath.apps.googleusercontent.com" -client_secret = "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" - -[pair holidays] -a = "holidays_local" -b = "holidays_remote" -collections = null -conflict_resolution = "b wins" -metadata = ["color"] - -[storage holidays_local] -type = "filesystem" -path = "~/.config/vdirsyncer/calendars/holidays/" -fileext = ".ics" - -[storage holidays_remote] -type = "http" -url = "https://calendar.google.com/calendar/ical/en.norwegian%23holiday%40group.v.calendar.google.com/public/basic.ics" -read_only = "true" diff --git a/vdirsyncer/config.secret b/vdirsyncer/config.secret new file mode 100644 index 0000000000000000000000000000000000000000..83fec2a099778f5258748b196c6e7dfa7c300c51 GIT binary patch literal 1299 zcmV+u1?>8T0gMA{hqi78NQ7wt3;?x+H?EXg8s^^amEzvVliF*WeUhp4GIB0P=t=!9u+QDMu*@ zbnb6*Q8)3lkr(~>EYrb7KcPo67bE?rf^-BNE#KZmd_WLI%y^YpHKczV9m#l^uF+!E^b<;}k4yC~lp^$8TtG91!i0q^6L z;%eSzC4QK8lgmE-oIqt8)tUJ~rCwWR^Nx`4{_u(G{19b_p<0k=+x~=J1H|Pzj{g}f zz7hckK#9s6L#|rrlD@0}GOXAq8I~cZ{PCOerj4dN|VQ0mA?VSu|u%GUf*E+}zvb z5uW_6M#`b$%!`5q7TBPS184iR2g41_QR~x~R}_Q;`slRc3#RMrM*8e-b&K*lwG6;@ z_&h=&EY#W6>Ko*cosReJbYnO4QaEGG2gWLwRvcL~8hnv7RW>^EfLd)!a-}L*>9f8~ z;PFGGxG&g%&WI(|ol!nwq(G`zrU#)T{>cA?=RNnL4tSFiW#c>2MSuy;t~5!ofaJ6c zi!<(i;Up}EuQ9&*`eCpHGW@W)51D?@733=Zw5i%OT>vMBXTY#l{(j2dKX-tQI1m`M zcbCXzJvLdcy{-`4SHsXdBvb<(pI=X-60*iMUeDjQ0*&AKiJrwBI05jt2)D*CjYx%U4Z z8pH`sUupsHe{=G^q?!d{^ks+>po7Z7n8mR%ygeR0tH9Es#1(Kp7{M~Oz4T?T+4}h3 zZ4z#@d1eauA(ZJzMTIK&42X%oXxt=R$ofuXz+m~fN!8*^@{UGx%QwSATR(+1sJmTb zHK5hivF#pa8^`EA`nUq&bM+?dQ-B8Faq*(;lm3rbwWnC{NvmN)^u&w^Rbqv~oZ0d|cA`^QU*P1FyrbI-HV4J&-d3*wRBzmg3sv0{HJ41Wrxy6QQYb}5w ztY*JXvOZ5W9E<}CKHz2Hnn>qW1gR?sVp@UmW?*0KGdSimMUNsw7zj6H4bB>Sw8k5m zDe%`OZ&&B%{=etwci9gex$XJ^=QtA)^_L7Yocbn4T3*9s7lwokwZqJW+Ouh-x+H3& J;}dFgN|6P6fUf`m literal 0 HcmV?d00001