From 41e1bf2bdccf4882171c99687a5c685e75ae6540 Mon Sep 17 00:00:00 2001 From: Soispha Date: Sat, 23 Mar 2024 20:43:47 +0100 Subject: fix(hm/conf/unison): Remove auto merge feature This never really worked and would only really be useful, if I merged things by hand. But the only way forward, I see right now, is paved by avoiding the need to merge stuff altogether. --- hm/soispha/conf/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hm/soispha/conf/unison/default.nix b/hm/soispha/conf/unison/default.nix index 6e17a86a..f681c6d8 100644 --- a/hm/soispha/conf/unison/default.nix +++ b/hm/soispha/conf/unison/default.nix @@ -19,9 +19,9 @@ backupdir = "${unisonPath}/backups"; backuploc = "central"; backupcurr = paths_to_merge; - merge = - builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW'') - paths_to_merge; + # merge = + # builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW'') + # paths_to_merge; }; paths_to_merge = mkPathName { -- cgit 1.4.1