From 6cd16cfab0e9d8557d8a6e876fffb636da615cc9 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Thu, 24 Oct 2024 15:13:13 +0200
Subject: feat(modules/unison): Auto-ignore all symlinks made with `home.file`
This allows us to actually sync symlinks, as most of the unwanted ones
are already ignored. And syncing the `.direnv` gc-roots is not that much
of a problem, because these are re-generated when they point to a
non-existent path.
---
modules/by-name/un/unison/module.nix | 3 ---
modules/by-name/un/unison/shellScript.nix | 6 +-----
2 files changed, 1 insertion(+), 8 deletions(-)
(limited to 'modules/by-name')
diff --git a/modules/by-name/un/unison/module.nix b/modules/by-name/un/unison/module.nix
index baf92b02..9de27c0f 100644
--- a/modules/by-name/un/unison/module.nix
+++ b/modules/by-name/un/unison/module.nix
@@ -66,9 +66,6 @@ in {
sshcmd = "ssh";
ui = "text";
auto = "true";
- # This is a trap, thanks to the HM links
- # TODO: Auto-ignore all `home.file` paths <2024-10-24>
- links = "false";
backupdir = "${cfg.dataDir}/backups";
backuploc = "central";
diff --git a/modules/by-name/un/unison/shellScript.nix b/modules/by-name/un/unison/shellScript.nix
index 5ff0c219..4618ae8e 100644
--- a/modules/by-name/un/unison/shellScript.nix
+++ b/modules/by-name/un/unison/shellScript.nix
@@ -78,11 +78,7 @@ in
export UNISON=${esa cfg.dataDir};
- if [ "$1" = "links" ]; then
- shift 1;
- EXTRA_OPTIONS="-links=true";
- fi
- EXTRA_OPTIONS="$EXTRA_OPTIONS $*"
+ EXTRA_OPTIONS="$UNISON_EXTRA_OPTIONS $*"
''
+ script);
--
cgit 1.4.1