diff options
| -rw-r--r-- | khal/config | 5 | ||||
| -rw-r--r-- | vdirsyncer/config | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/khal/config b/khal/config index a118d23..5c34bb4 100644 --- a/khal/config +++ b/khal/config @@ -5,6 +5,11 @@ path = ~/.calendars/radicale-rimsky/7c38e0c7-4a42-9863-c9e0-6025a32c4a65 color = light green priority = 10 +[[radicale-rimsky-alternative]] +path = ~/.calendars/radicale-rimsky-alternative/bb48f855-f7bc-183f-f79d-275327d426d5 +color = light magenta +priority = 10 + [[google_home]] path = ~/.calendars/google/12panp3nqdbmm9df4if9jigigo@group.calendar.google.com/ color = light blue diff --git a/vdirsyncer/config b/vdirsyncer/config index 134b844..5d981f8 100644 --- a/vdirsyncer/config +++ b/vdirsyncer/config @@ -22,6 +22,8 @@ password.fetch = ["command", "pass", "show", "radicale_lemon_user"] # CALDAV +# +# rimsky primary [pair radicale_rimsky] a = "radicale_local_rimsky" b = "radicale_remote_rimsky" @@ -40,6 +42,27 @@ url = "http://radicale.banded-neon.ts.net/radicale/lemon/7c38e0c7-4a42-9863-c9e0 username = "lemon" password.fetch = ["command", "pass", "show", "radicale_lemon_user"] +# rimsky alternative +[pair radicale_rimsky_alternative] +a = "radicale_local_rimsky_alternative" +b = "radicale_remote_rimsky_alternative" +collections = ["from a", "from b"] +metadata = ["color", "displayname"] +conflict_resolution = "b wins" + +[storage radicale_local_rimsky_alternative] +type = "filesystem" +path = "~/.calendars/radicale-rimsky-alternative/" +fileext = ".ics" + +[storage radicale_remote_rimsky_alternative] +type = "caldav" +url = "http://radicale.banded-neon.ts.net/radicale/lemon/bb48f855-f7bc-183f-f79d-275327d426d5/" +username = "lemon" +password.fetch = ["command", "pass", "show", "radicale_lemon_user"] + +# Google + [pair google] a = "google_local" b = "google_remote" |