Compare commits

..

1 commit

Author SHA1 Message Date
d854b93393 Remove version lock for shairport-sync
The current version in nixpkgs is newer than the one we are currently locking, the nqptp fix was also already in nixpkgs.
2024-11-02 22:48:56 +01:00
5 changed files with 21 additions and 4 deletions

View file

@ -37,7 +37,7 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
audio-hauptraum-kueche = nixpkgs.lib.nixosSystem { audio-hauptraum-kueche = nixpkgs-unstable.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
./config/common ./config/common

View file

@ -12,6 +12,7 @@ in
imports = [ imports = [
./librespot.nix ./librespot.nix
./mpd.nix ./mpd.nix
./networking.nix
./pipewire.nix ./pipewire.nix
./shairport-sync.nix ./shairport-sync.nix
]; ];

View file

@ -23,7 +23,7 @@ in
After = [ "network-online.target" "pipewire.service" ]; After = [ "network-online.target" "pipewire.service" ];
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.librespot}/bin/librespot --name '${config.ccchh.services.audio.name}' --device-type speaker --bitrate 320 --enable-volume-normalisation --disable-audio-cache --disable-credential-cache"; ExecStart = "${pkgs.librespot}/bin/librespot --name '${config.ccchh.services.audio.name}' --device-type speaker --bitrate 320 --enable-volume-normalisation --disable-audio-cache --disable-credential-cache --quiet";
User = "librespot"; User = "librespot";
Group = "librespot"; Group = "librespot";
}; };
@ -34,7 +34,7 @@ in
users.librespot = { users.librespot = {
isSystemUser = true; isSystemUser = true;
group = "librespot"; group = "librespot";
extraGroups = [ "pipewire" "audio" ]; extraGroups = [ "pipewire" ];
}; };
groups.librespot = { }; groups.librespot = { };
}; };

View file

@ -0,0 +1,16 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.ccchh.services.audio;
in
{
config = mkIf cfg.enable {
# Disable IPv6, since Shairport-Sync doesn't work with IPv6. Unclear why.
networking.enableIPv6 = false;
};
}

View file

@ -20,7 +20,7 @@ in
arguments = "-o pw -v"; arguments = "-o pw -v";
}; };
users.users.shairport.extraGroups = [ "pipewire" "audio" ]; users.users.shairport.extraGroups = [ "pipewire" ];
environment.etc.shairport-sync-config = { environment.etc.shairport-sync-config = {
enable = true; enable = true;