about summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-10-24 15:13:13 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-10-24 15:13:13 +0200
commit6cd16cfab0e9d8557d8a6e876fffb636da615cc9 (patch)
treef7893309ec1a3e776df733384ff7cd984a7c0aff /modules
parentrefactor({modules,pkgs}/by-name-overlay): De-duplicate in a `nixLib` (diff)
downloadnixos-config-6cd16cfab0e9d8557d8a6e876fffb636da615cc9.tar.gz
nixos-config-6cd16cfab0e9d8557d8a6e876fffb636da615cc9.zip
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.
Diffstat (limited to 'modules')
-rw-r--r--modules/by-name/un/unison/module.nix3
-rw-r--r--modules/by-name/un/unison/shellScript.nix6
2 files changed, 1 insertions, 8 deletions
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);