From 6cd3a8e58f563dc83ce3f89dc83eae7afa27040c Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Tue, 19 Dec 2023 14:13:38 +0100
Subject: [PATCH] modules/syncthing: use generator path

---
 clanModules/syncthing.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/clanModules/syncthing.nix b/clanModules/syncthing.nix
index d50da772..6ea02573 100644
--- a/clanModules/syncthing.nix
+++ b/clanModules/syncthing.nix
@@ -193,12 +193,17 @@
         secrets."syncthing.cert" = { };
         secrets."syncthing.api" = { };
         facts."syncthing.pub" = { };
+        generator.path = [
+          pkgs.coreutils
+          pkgs.gnugrep
+          pkgs.syncthing
+        ];
         generator.script = ''
-          ${pkgs.syncthing}/bin/syncthing generate --config "$secrets"
+          syncthing generate --config "$secrets"
           mv "$secrets"/key.pem "$secrets"/syncthing.key
           mv "$secrets"/cert.pem "$secrets"/syncthing.cert
-          cat "$secrets"/config.xml | ${pkgs.gnugrep}/bin/grep -oP '(?<=<device id=")[^"]+' | uniq > "$facts"/syncthing.pub
-          cat "$secrets"/config.xml | ${pkgs.gnugrep}/bin/grep -oP '<apikey>\K[^<]+' | uniq > "$secrets"/syncthing.api
+          cat "$secrets"/config.xml | grep -oP '(?<=<device id=")[^"]+' | uniq > "$facts"/syncthing.pub
+          cat "$secrets"/config.xml | grep -oP '<apikey>\K[^<]+' | uniq > "$secrets"/syncthing.api
         '';
       };
     }