feat(hass): setup a working SpotifyPlus

devices/homie/modules/home-assistant/bluetooth.nix

@@ -36,6 +36,7 @@ in {
 
     extraComponents = [
       "mpd"
+      "sonos"
 
       # BT components
       "ibeacon"

devices/homie/modules/home-assistant/default.nix

@@ -48,7 +48,9 @@
     enable = true;
 
     extraComponents = [
+      "androidtv_remote"
       "caldav"
+      "cast"
       "holiday"
       "isal"
       "met"

devices/homie/modules/music/default.nix

@@ -3,7 +3,10 @@
   lib,
   pkgs,
   ...
-}: {
+}: let
+  inherit (lib) getExe;
+  inherit (config.vars) mainUser;
+in {
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;
@@ -19,10 +22,17 @@
     };
   };
 
-  # Have pulseaudio.service itself start at boot but after bluetooth
+  # Have pulseaudio and spotifyd start at boot but after bluetooth
   # so bluetooth accepts sound connections from the start.
-  systemd.user.services.pulseaudio.after = ["bluetooth.service"];
+  users.users.${mainUser}.linger = true;
-  systemd.user.targets.default.wants = ["pulseaudio.service"];
+  systemd.user.services = {
+    pulseaudio.after = ["bluetooth.service"];
+    spotifyd.after = ["pulseaudio.service"];
+  };
+  systemd.user.targets.default.wants = [
+    "pulseaudio.service"
+    "spotifyd.service"
+  ];
 
   # Allow pulseaudio to be managed by MPD
   hardware.pulseaudio = {
@@ -58,19 +68,21 @@
         }
       '';
     };
+  };
 
-    spotifyd = {
+  home-manager.users.${mainUser}.services.spotifyd = {
     enable = true;
 
-      settings.global = let
+    package = pkgs.spotifyd.override {
-        cacheDir = "/etc/spotifyd";
+      withMpris = false;
-      in {
+      withKeyring = false;
+    };
+
+    settings.global = {
       device_name = config.networking.hostName + " connect";
       device_type = "speaker";
 
       zeroconf_port = 33798;
-        cache_path = cacheDir;
-        username_cmd = "${lib.getExe pkgs.jq} -r .username ${cacheDir}/credentials.json";
 
       autoplay = false;
       backend = "pulseaudio";
@@ -79,19 +91,15 @@
       volume_normalisation = false;
     };
   };
-  };
 
-  environment.etc."spotifyd/credentials.json" = {
+  systemd.services.home-assistant.preStart = let
-    source = config.sops.secrets.spotifyd.path;
+    WorkingDirectory = "/var/lib/hass";
-  };
+    creds = config.sops.secrets.spotifyd.path;
-
+  in
-  nixpkgs.overlays = [
+    getExe (pkgs.writeShellApplication {
-    (final: prev: {
+      name = "spotify-plus-creds";
-      # FIXME: remove this if https://github.com/NixOS/nixpkgs/pull/342913 is merged
+      text = ''
-      spotifyd = prev.spotifyd.override {
+        cp -f ${creds} ${WorkingDirectory}/.storage/SpotifyWebApiPython_librespot_credentials.json
-        withMpris = false;
+      '';
-        withKeyring = false;
+    });
-      };
-    })
-  ];
 }

flake.lock

@@ -1872,11 +1872,11 @@
     "spotifyplus-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1727276581,
+        "lastModified": 1727556884,
-        "narHash": "sha256-6fMuJ5g0SbHqm84fYoOuP2zJ6/c7rLAC6ltpGR2eOHo=",
+        "narHash": "sha256-HBGGB9MtQlOzQxN39bUzWl9+iElAc6HJHeisfGqaLLE=",
         "owner": "thlucas1",
         "repo": "homeassistantcomponent_spotifyplus",
-        "rev": "dbc279fd3466b5aebc82dea3c49f9ad175c83985",
+        "rev": "f017285d88405749a0c21da14dff7dae6e46f39c",
         "type": "github"
       },
       "original": {
@@ -1888,11 +1888,11 @@
     "spotifywebapi-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1727382400,
+        "lastModified": 1727551631,
-        "narHash": "sha256-meoiGg2CbAjvjIM7L0OW19Y2w9q4+or+JjhTXdLLebM=",
+        "narHash": "sha256-Dj9cQ/Zm9Th0QnQV+2Q/+8sc3LwywAAIMPv8ZKOkr7M=",
         "owner": "thlucas1",
         "repo": "SpotifyWebApiPython",
-        "rev": "092a1cf17dae9a9c7f62b5dc3616fe807115636f",
+        "rev": "9f5ea3dcadc531dfdbf6b6f9ecea58e3b3094494",
         "type": "github"
       },
       "original": {