From 58e6cad052a1904bf9f58ab723e281b472101ebb Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Mon, 8 Nov 2021 18:04:14 +0100 Subject: [PATCH] pipewire: Remove hacky override of bluez quirks db Nixpkgs now treats it as data, so it is not set in the module. As an alternative, hardware volume is disabled globally. --- modules/pipewire.nix | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/modules/pipewire.nix b/modules/pipewire.nix index 2fd8f7b..60b868b 100644 --- a/modules/pipewire.nix +++ b/modules/pipewire.nix @@ -12,22 +12,15 @@ lib.mkIf config.sbruder.gui.enable { enable = true; support32Bit = true; }; - }; - # not exposed in NixOS module - environment.etc."pipewire/media-session.d/bluez-hardware.conf".source = lib.mkForce ((pkgs.formats.json { }).generate "bluez-hardware.conf" ( - let - defaults = (builtins.fromJSON (builtins.readFile "${modulesPath}/services/desktops/pipewire/bluez-hardware.conf.json")); - in - defaults // { - "bluez5.features.device" = defaults."bluez5.features.device" ++ [ - # Sennheiser HD 4.50BTNC has unreliable hardware volume control (too - # frequent changes cause it to not apply the changes) and sometimes - # crashes (disconnects and shuts off) after too many changes. - { name = "HD 4.50BTNC"; no-features = [ "hw-volume" ]; } - ]; - } - )); + media-session = { + config = { + bluez-monitor = { + "bluez5.enable-hw-volume" = true; + }; + }; + }; + }; environment.systemPackages = with pkgs; [ pavucontrol