From f9b349f04e081862bf94f00416a0c9d97f96f39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20K=C3=A4nner?= Date: Mon, 3 Mar 2025 14:09:44 +0100 Subject: [PATCH] 583 current 1970-01-01 01:00:00 24.11.20250301.5ef6c42 6.6.80 * --- modules/home/programs/rclone.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/programs/rclone.nix b/modules/home/programs/rclone.nix index 2c4372a..5093b81 100644 --- a/modules/home/programs/rclone.nix +++ b/modules/home/programs/rclone.nix @@ -105,7 +105,7 @@ in { }; Service = { Type = "oneshot"; - ExecStart = "${pkgs.rclone}/bin/rclone --config=${config.sops.templates."rclone.conf".path} --resilient --recover -v --exclude-from %h/Documents/sync-exclude.txt bisync cloud:Documents %h/Documents"; + ExecStart = "${pkgs.rclone}/bin/rclone --config=${config.sops.templates."rclone.conf".path} --resilient --recover -v --conflict-resolve newer --exclude-from %h/Documents/sync-exclude.txt bisync cloud:Documents %h/Documents"; }; Install.WantedBy = ["default.target"]; };