summary refs log tree commit diff
path: root/nixos/modules/services/desktops
diff options
context:
space:
mode:
authorIlan Joselevich <personal@ilanjoselevich.com>2021-08-06 16:50:56 +0300
committerIlan Joselevich <personal@ilanjoselevich.com>2021-08-06 16:50:56 +0300
commita876500f5db7f7827c14d1d5b195186613c20a29 (patch)
tree58b9d15b892500d5e7246e7cb35a1bedf1bc5293 /nixos/modules/services/desktops
parent779472d9bcc518fdb01c01424b2a469dc39694ee (diff)
downloadnixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.tar
nixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.tar.gz
nixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.tar.bz2
nixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.tar.lz
nixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.tar.xz
nixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.tar.zst
nixpkgs-a876500f5db7f7827c14d1d5b195186613c20a29.zip
pipewire: updated JSON configs
Diffstat (limited to 'nixos/modules/services/desktops')
-rw-r--r--nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json35
-rw-r--r--nixos/modules/services/desktops/pipewire/jack.conf.json12
-rw-r--r--nixos/modules/services/desktops/pipewire/media-session.conf.json1
3 files changed, 47 insertions, 1 deletions
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
@@ -28,6 +28,12 @@
       ]
     },
     {
+      "name": "BAA 100",
+      "no-features": [
+        "hw-volume"
+      ]
+    },
+    {
       "name": "JBL Endurance RUN BT",
       "no-features": [
         "msbc-alt1",
@@ -191,6 +197,35 @@
       ]
     },
     {
+      "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"