Merge branch 'master' of github.com:dopefishh/dotfiles

diff --combined cal/.config/vdirsyncer/config
index bada49b,c0232f9..8b36018
--- 1/cal/.config/vdirsyncer/config
--- 2/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@@ -17,6 -17,7 +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 +36,7 @@@ password.fetch = ["command", "pass", "s
  a = "calendar_local"
  b = "calendar_remote"
  collections = ["from b"]
+ conflict_resolution = "b wins"
  
  [storage calendar_local]
  type = "filesystem"
@@@ -47,22 -49,37 +49,22 @@@ url = "https://cal.martlubbers.net/dav.
  #auth = digest
  username = "mart"
  password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 -##
 -## Tasks
 -#[pair tasks]
 -#a = "tasks_local"
 -#b = "tasks_remote"
 -#conflict_resolution = "a wins"
 -#collections = ["from b"]
 -#
 -#[storage tasks_local]
 -#type = "filesystem"
 -#path = "~/.vdirsyncer/tasks"
 -#fileext = ".ics"
 -#
 -#[storage tasks_remote]
 -#type = "caldav"
 -#url = "https://cal.martlubbers.net/caldav.php/task"
 -##auth = digest
 -#username = "task"
 -#password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 -#
 -## UNI
 -#[pair uni]
 -#a = "uni_local"
 -#b = "uni_remote"
 -#collections = null
 -#
 -#[storage uni_local]
 -#type = "filesystem"
 -#path = "~/.vdirsyncer/uni"
 -#fileext = ".ics"
 -#
 -#[storage uni_remote]
 -#type = "http"
 -#url = "http://persoonlijkrooster.ru.nl/ical?57b59e14&eu=czQxMDk1MDM=&t=9d96e939-2d1b-4b49-b376-93937bc08725"
 +
 +# Tasks
 +[pair tasks]
 +a = "tasks_local"
 +b = "tasks_remote"
 +conflict_resolution = "a wins"
 +collections = ["from b"]
 +
 +[storage tasks_local]
 +type = "filesystem"
 +path = "~/.vdirsyncer/tasks"
 +fileext = ".ics"
 +
 +[storage tasks_remote]
 +type = "caldav"
 +url = "https://cal.martlubbers.net/dav.php/calendars"
 +#auth = digest
 +username = "task"
 +password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]