From 20fac9bbdf22d697ad68faabb7f95d4deba4f712 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Feb 2025 10:16:42 -0600
Subject: [PATCH] syncthing: use package options

Currently, all references are hardcoded even though we offer package
options. Update to use package options.
---
 modules/services/syncthing.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index f609b3b65..5cfce683e 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -38,13 +38,13 @@ let
           device) folder.devices;
     }) (filterAttrs (_: folder: folder.enable) cfg.settings.folders);
 
-  jq = "${pkgs.jq}/bin/jq";
-  sleep = "${pkgs.coreutils}/bin/sleep";
-  printf = "${pkgs.coreutils}/bin/printf";
-  cat = "${pkgs.coreutils}/bin/cat";
-  curl = "${pkgs.curl}/bin/curl";
-  install = "${pkgs.coreutils}/bin/install";
-  syncthing = "${pkgs.syncthing}/bin/syncthing";
+  jq = lib.getExe pkgs.jq;
+  sleep = lib.getExe' pkgs.coreutils "sleep";
+  printf = lib.getExe' pkgs.coreutils "printf";
+  cat = lib.getExe' pkgs.coreutils "cat";
+  curl = lib.getExe pkgs.curl;
+  install = lib.getExe' pkgs.coreutils "install";
+  syncthing = lib.getExe cfg.package;
 
   updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
     set -efu
@@ -606,7 +606,7 @@ in {
 
   config = mkMerge [
     (mkIf cfg.enable {
-      home.packages = [ (getOutput "man" pkgs.syncthing) ];
+      home.packages = [ (getOutput "man" cfg.package) ];
 
       systemd.user.services = {
         syncthing = {