summary refs log tree commit diff
path: root/.config/pimsync
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.config/pimsync/pimsync.conf18
1 files changed, 11 insertions, 7 deletions
diff --git a/.config/pimsync/pimsync.conf b/.config/pimsync/pimsync.conf
index 8fed018..b85c959 100644
--- a/.config/pimsync/pimsync.conf
+++ b/.config/pimsync/pimsync.conf
@@ -4,22 +4,26 @@ status_path "~/.local/state/pimsync/status/"
 # PAIRS
 
 pair calendars_robert {
-	storage_a calendars_robert_local
-	storage_b gzr_robert_calendar_remote
+	storage_a gzr_robert_calendar_remote
+	storage_b calendars_robert_local
 	collections all
+	conflict_resolution cmd nvim -d
 }
 
 pair contacts_robert {
-	storage_a contacts_local
-	storage_b gzr_robert_contacts_remote
+	storage_a gzr_robert_contacts_remote
+	storage_b contacts_local
 	collections all
+	conflict_resolution cmd nvim -d
 }
 
 pair calendars_goro {
-	storage_a calendars_goro_local
-	storage_b gzr_goro_calendar_remote
+	storage_a gzr_goro_calendar_remote
+	storage_b calendars_goro_local
 	# NOTE: only sync events
-	collection events
+	# collection events
+	collections all
+	conflict_resolution cmd nvim -d
 }
 
 # STORAGE LOCAL