summary refs log tree commit diff
path: root/nixos/modules/services/desktops
diff options
context:
space:
mode:
authorJan Solanti <jhs@psonet.com>2021-09-25 17:49:23 +0300
committerJan Solanti <jhs@psonet.com>2021-09-25 17:51:39 +0300
commitc12e8a63ba77684ad430c18545568c3f2dd4e26d (patch)
tree4512e891344d679150e261d2365e23d93e587d98 /nixos/modules/services/desktops
parent9e2e902c19e175a86fd7470c507b7588d01322ea (diff)
downloadnixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.tar
nixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.tar.gz
nixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.tar.bz2
nixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.tar.lz
nixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.tar.xz
nixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.tar.zst
nixpkgs-c12e8a63ba77684ad430c18545568c3f2dd4e26d.zip
pipewire: 0.3.36 -> 0.3.37
Diffstat (limited to 'nixos/modules/services/desktops')
-rw-r--r--nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json250
-rw-r--r--nixos/modules/services/desktops/pipewire/pipewire-media-session.nix6
2 files changed, 0 insertions, 256 deletions
diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
deleted file mode 100644
index e5e7517e38d..00000000000
--- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "bluez5.features.device": [
-    {
-      "name": "Air 1 Plus",
-      "no-features": [
-        "hw-volume-mic"
-      ]
-    },
-    {
-      "name": "AirPods",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "name": "AirPods Pro",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "name": "AXLOIE Goin",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "name": "BAA 100",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "name": "D50s",
-      "address": "~^00:13:ef:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "name": "JBL Endurance RUN BT",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl",
-        "sbc-xq"
-      ]
-    },
-    {
-      "name": "JBL LIVE650BTNC"
-    },
-    {
-      "name": "Motorola DC800",
-      "no-features": [
-        "sbc-xq"
-      ]
-    },
-    {
-      "name": "Motorola S305",
-      "no-features": [
-        "sbc-xq"
-      ]
-    },
-    {
-      "name": "Soundcore Life P2-L",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "name": "Urbanista Stockholm Plus",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "address": "~^94:16:25:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^9c:64:8b:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^a0:e9:db:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^0c:a6:94:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^00:14:02:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^44:5e:f3:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^d4:9c:28:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^00:18:6b:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^b8:ad:3e:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^a0:e9:db:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^00:24:1c:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^00:11:b1:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^a4:15:66:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^00:14:f1:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^00:26:7e:",
-      "no-features": [
-        "hw-volume"
-      ]
-    },
-    {
-      "address": "~^90:03:b7:",
-      "no-features": [
-        "hw-volume"
-      ]
-    }
-  ],
-  "bluez5.features.adapter": [
-    {
-      "bus-type": "usb",
-      "vendor-id": "usb:0bda"
-    },
-    {
-      "bus-type": "usb",
-      "no-features": [
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "no-features": [
-        "msbc-alt1-rtl"
-      ]
-    }
-  ],
-  "bluez5.features.kernel": [
-    {
-      "sysname": "Linux",
-      "release": "~^[0-4]\\.",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "sysname": "Linux",
-      "release": "~^5\\.[1-7]\\.",
-      "no-features": [
-        "msbc-alt1",
-        "msbc-alt1-rtl"
-      ]
-    },
-    {
-      "sysname": "Linux",
-      "release": "~^5\\.(8|9)\\.",
-      "no-features": [
-        "msbc-alt1"
-      ]
-    },
-    {
-      "sysname": "Linux",
-      "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|51|52|53|54|55|56|57|58|59|60|61)($|[^0-9])",
-      "no-features": [
-        "msbc-alt1"
-      ]
-    },
-    {
-      "sysname": "Linux",
-      "release": "~^5\\.12\\.(18|19)($|[^0-9])",
-      "no-features": [
-        "msbc-alt1"
-      ]
-    },
-    {
-      "sysname": "Linux",
-      "release": "~^5\\.13\\.(3|4|5|6|7|8|9|10|11|12|13)($|[^0-9])",
-      "no-features": [
-        "msbc-alt1"
-      ]
-    },
-    {
-      "sysname": "Linux",
-      "release": "~^5\\.14($|[^0-9])",
-      "no-features": [
-        "msbc-alt1"
-      ]
-    },
-    {
-      "no-features": []
-    }
-  ]
-}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index 41ab995e329..17a2d49bb1f 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -15,7 +15,6 @@ let
   defaults = {
     alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
     bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
-    bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json));
     media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
     v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
   };
@@ -23,7 +22,6 @@ let
   configs = {
     alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor;
     bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor;
-    bluez-hardware = defaults.bluez-hardware;
     media-session = recursiveUpdate defaults.media-session cfg.config.media-session;
     v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor;
   };
@@ -122,10 +120,6 @@ in {
       mkIf config.services.pipewire.pulse.enable {
         source = json.generate "bluez-monitor.conf" configs.bluez-monitor;
       };
-    environment.etc."pipewire/media-session.d/bluez-hardware.conf" =
-      mkIf config.services.pipewire.pulse.enable {
-        source = json.generate "bluez-hardware.conf" configs.bluez-hardware;
-      };
 
     environment.etc."pipewire/media-session.d/with-jack" =
       mkIf config.services.pipewire.jack.enable {