From 6a4960066d550781b8494205312c4795588bb420 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Dec 2025 21:15:41 +0100
Subject: [PATCH] shairport-sync: use settings module instead of custom text
 string

---
 modules/services/audio/shairport-sync.nix | 60 +++++++++--------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/modules/services/audio/shairport-sync.nix b/modules/services/audio/shairport-sync.nix
index 43d1285..f02485f 100644
--- a/modules/services/audio/shairport-sync.nix
+++ b/modules/services/audio/shairport-sync.nix
@@ -18,47 +18,33 @@ in
     services.shairport-sync = {
       enable = true;
       package = pkgs.shairport-sync-airplay2;
-      arguments = "-o pw -v";
+      settings = {
+        diagnostics = {
+          log_verbosity = 1;
+        };
+        general = {
+          name = cfg.name;
+          output_backend = "pw";
+        };
+        metadata = {
+          enabled = "yes";
+          include_cover_art = "yes";
+          cover_art_cache_directory = "/tmp/shairport-sync/.cache/coverart";
+          pipe_name = "/tmp/shairport-sync-metadata";
+          pipe_timeout = 5000;
+        };
+        mqtt = {
+          enabled = "yes";
+          hostname = "mqtt.ccchh.net";
+          port = 1883;
+          publish_parsed = "yes";
+          publish_cover = "yes";
+        };
+      };
     };
 
     users.users.shairport.extraGroups = [ "pipewire" "audio" ];
 
-    environment.etc.shairport-sync-config = {
-      enable = true;
-      text = ''
-        // Config for MQTT and metadata.
-        // For reference see:
-        // https://github.com/mikebrady/shairport-sync/blob/8c607e2d61ea5fde8ed0b48b2471a543840c31e6/scripts/shairport-sync.conf
-        // https://github.com/mikebrady/shairport-sync/blob/0f0f65b67649d4a25d06f13b56a6077a90b0f6cc/MQTT.md
-        general =
-        {
-          name = "${cfg.name}";
-        }
-
-        metadata =
-        {
-          enabled = "yes"; // set this to yes to get Shairport Sync to solicit metadata from the source and to pass it on via a pipe
-          include_cover_art = "yes"; // set to "yes" to get Shairport Sync to solicit cover art from the source and pass it via the pipe. You must also set "enabled" to "yes".
-          cover_art_cache_directory = "/tmp/shairport-sync/.cache/coverart"; // artwork will be  stored in this directory if the dbus or MPRIS interfaces are enabled or if the MQTT client is in use. Set it to "" to prevent caching, which may be useful on some systems
-          pipe_name = "/tmp/shairport-sync-metadata";
-          pipe_timeout = 5000; // wait for this number of milliseconds for a blocked pipe to unblock before giving up
-        };
-
-
-        mqtt =
-        {
-          enabled = "yes"; // set this to yes to enable the mqtt-metadata-service
-          hostname = "mqtt.ccchh.net"; // Hostname of the MQTT Broker
-          port = 1883; // Port on the MQTT Broker to connect to
-        //	publish_raw = "no"; //whether to publish all available metadata under the codes given in the 'metadata' docs.
-          publish_parsed = "yes"; //whether to publish a small (but useful) subset of metadata under human-understandable topics
-          publish_cover = "yes"; //whether to publish the cover over mqtt in binary form. This may lead to a bit of load on the broker
-        //	enable_remote = "yes"; //whether to remote control via MQTT. RC is available under `topic`/remote.
-        };
-      '';
-      target = "shairport-sync.conf";
-    };
-
     systemd.services.shairport-sync = {
       serviceConfig = {
         Restart = "on-failure";
-- 
2.50.1