new msmtp

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index f52762c..c0232f9 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -17,6 +17,7 @@ status_path = "~/.vdirsyncer/status/"
 a = "contacts_local"
 b = "contacts_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage contacts_local]
 type = "filesystem"
@@ -35,6 +36,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 a = "calendar_local"
 b = "calendar_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage calendar_local]
 type = "filesystem"

diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config
index f26f9a6..f7fb90a 100644 (file)
--- a/email/.config/msmtp/config
+++ b/email/.config/msmtp/config
@@ -3,7 +3,7 @@ host lubbers.email
 port 587
 auth on
 tls on
-tls_fingerprint DD:C2:A4:24:E6:FA:6B:E3:B5:51:63:6B:F5:62:60:3B:3D:D4:A7:75:37:50:93:02:BA:FC:6A:D4:02:D1:A8:7E
+tls_fingerprint 0E:A9:61:32:60:79:79:0E:16:0B:67:C4:31:4E:21:FC:4C:05:5B:DC:9B:6B:F2:51:10:EF:BB:8A:6E:F4:A5:93
 user mart@martlubbers.net
 passwordeval pass mail/mart@martlubbers.net
 #proxy_host localhost

diff --git a/texlive.profile b/texlive.profile
index 1860901..68c56af 100644 (file)
--- a/texlive.profile
+++ b/texlive.profile
@@ -1,14 +1,14 @@
-# texlive.profile written on Wed May  9 14:04:26 2018 UTC
+# texlive.profile written on Wed May 16 05:37:14 2018 UTC
 # It will NOT be updated and reflects only the
 # installation profile at installation time.
 selected_scheme scheme-infraonly
 TEXDIR /opt/texlive/2018
-TEXMFCONFIG ~/.local/share/texlive/2018/texmf-config
-TEXMFHOME ~/.local/share/texlive/2018/texmf
+TEXMFCONFIG ~/.local/share/texlive/texmf-config
+TEXMFHOME ~/.local/share/texlive/texmf
 TEXMFLOCAL /opt/texlive/texmf-local
 TEXMFSYSCONFIG /opt/texlive/2018/texmf-config
 TEXMFSYSVAR /opt/texlive/2018/texmf-var
-TEXMFVAR ~/.local/share/texlive/2018/texmf-var
+TEXMFVAR ~/.local/share/texlive/texmf-var
 binary_x86_64-linux 1
 instopt_adjustpath 0
 instopt_adjustrepo 1