diff options
| author | Soispha <soispha@vhack.eu> | 2024-03-23 20:43:47 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-03-23 20:43:47 +0100 |
| commit | 41e1bf2bdccf4882171c99687a5c685e75ae6540 (patch) | |
| tree | c2cb1f430921f2eb83061598aad157624febaeb9 | |
| parent | refactor(treewide): Update to new modules names (and simplify some code) (diff) | |
| download | nixos-config-41e1bf2bdccf4882171c99687a5c685e75ae6540.tar.gz nixos-config-41e1bf2bdccf4882171c99687a5c685e75ae6540.zip | |
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.
| -rw-r--r-- | hm/soispha/conf/unison/default.nix | 6 |
1 files 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 { |