From 45ea565f6de39c1b8434e6c838ae7556e688ae2f Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Fri, 6 Aug 2021 16:50:56 +0300
Subject: [PATCH] pipewire: updated JSON configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit a876500f5db7f7827c14d1d5b195186613c20a29)
Signed-off-by: Domen Kožar <domen@dev.si>
---
.../pipewire/bluez-hardware.conf.json | 35 +++++++++++++++++++
.../services/desktops/pipewire/jack.conf.json | 12 ++++++-
.../desktops/pipewire/media-session.conf.json | 1 +
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
index 7c527b29215..cae9e1bdba0 100644
--- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
+++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
@@ -27,6 +27,12 @@
"msbc-alt1-rtl"
]
},
+ {
+ "name": "BAA 100",
+ "no-features": [
+ "hw-volume"
+ ]
+ },
{
"name": "JBL Endurance RUN BT",
"no-features": [
@@ -190,6 +196,35 @@
"msbc-alt1"
]
},
+ {
+ "sysname": "Linux",
+ "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])"
+ },
+ {
+ "sysname": "Linux",
+ "release": "~^5\\.12\\.",
+ "no-features": [
+ "msbc-alt1"
+ ]
+ },
+ {
+ "sysname": "Linux",
+ "release": "~^5\\.13\\.(1|2)($|[^0-9])"
+ },
+ {
+ "sysname": "Linux",
+ "release": "~^5\\.13\\.",
+ "no-features": [
+ "msbc-alt1"
+ ]
+ },
+ {
+ "sysname": "Linux",
+ "release": "~^5\\.14\\.",
+ "no-features": [
+ "msbc-alt1"
+ ]
+ },
{
"no-features": []
}
diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/jack.conf.json
index e36e04fffcf..128178bfa02 100644
--- a/nixos/modules/services/desktops/pipewire/jack.conf.json
+++ b/nixos/modules/services/desktops/pipewire/jack.conf.json
@@ -24,5 +24,15 @@
"name": "libpipewire-module-metadata"
}
],
- "jack.properties": {}
+ "jack.properties": {},
+ "jack.rules": [
+ {
+ "matches": [
+ {}
+ ],
+ "actions": {
+ "update-props": {}
+ }
+ }
+ ]
}
diff --git a/nixos/modules/services/desktops/pipewire/media-session.conf.json b/nixos/modules/services/desktops/pipewire/media-session.conf.json
index 24906e767d6..4b4e302af38 100644
--- a/nixos/modules/services/desktops/pipewire/media-session.conf.json
+++ b/nixos/modules/services/desktops/pipewire/media-session.conf.json
@@ -59,6 +59,7 @@
"with-pulseaudio": [
"with-audio",
"bluez5",
+ "bluez5-autoswitch",
"logind",
"restore-stream",
"streams-follow-default"