repositories
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add vimpraat and update calendar stuff
[dotfiles.git]
/
cal
/
.config
/
vdirsyncer
/
config
diff --git
a/cal/.config/vdirsyncer/config
b/cal/.config/vdirsyncer/config
index
b80f300
..
670e6aa
100644
(file)
--- a/
cal/.config/vdirsyncer/config
+++ b/
cal/.config/vdirsyncer/config
@@
-15,8
+15,7
@@
status_path = ~/.vdirsyncer/status/
[pair contacts]
a = contacts_local
b = contacts_remote
[pair contacts]
a = contacts_local
b = contacts_remote
-conflict_resolution = a wins
-collections = ["default"]
+collections = ["from b"]
[storage contacts_local]
type = filesystem
[storage contacts_local]
type = filesystem
@@
-25,8
+24,8
@@
fileext = .vcf
[storage contacts_remote]
type = carddav
[storage contacts_remote]
type = carddav
-url = https://
ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/defaul
t
-auth = digest
+url = https://
cal.martlubbers.net/caldav.php/mar
t
+
#
auth = digest
username = mart
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
username = mart
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
@@
-34,8
+33,7
@@
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
[pair calendar]
a = calendar_local
b = calendar_remote
[pair calendar]
a = calendar_local
b = calendar_remote
-conflict_resolution = a wins
-collections = ["default", "mart", "elvira", "vuilnis"]
+collections = ["from b"]
[storage calendar_local]
type = filesystem
[storage calendar_local]
type = filesystem
@@
-44,17
+42,17
@@
fileext = .ics
[storage calendar_remote]
type = caldav
[storage calendar_remote]
type = caldav
-url = https://
ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/defaul
t
-auth = digest
+url = https://
cal.martlubbers.net/caldav.php/mar
t
+
#
auth = digest
username = mart
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
username = mart
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
-
+#
# Tasks
[pair tasks]
a = tasks_local
b = tasks_remote
conflict_resolution = a wins
# Tasks
[pair tasks]
a = tasks_local
b = tasks_remote
conflict_resolution = a wins
-collections = ["
default
"]
+collections = ["
from b
"]
[storage tasks_local]
type = filesystem
[storage tasks_local]
type = filesystem
@@
-63,9
+61,9
@@
fileext = .ics
[storage tasks_remote]
type = caldav
[storage tasks_remote]
type = caldav
-url = https://
ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart2/default
-auth = digest
-username =
mart2
+url = https://
cal.martlubbers.net/caldav.php/task
+
#
auth = digest
+username =
task
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
# UNI
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
# UNI