pipewire: 0.3.21 -> 0.3.22

11 files changed, 447 insertions, 374 deletions

diff --git a/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json b/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
new file mode 100644
index 00000000000..5e8e1de6986
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
@@ -0,0 +1,48 @@
+{
+  "properties": {},
+  "rules": [
+    {
+      "actions": {
+        "update-props": {
+          "api": {
+            "acp": {
+              "auto-port": false,
+              "auto-profile": false
+            },
+            "alsa": {
+              "use-acp": true
+            }
+          }
+        }
+      },
+      "matches": [
+        {
+          "device": {
+            "name": "~alsa_card.*"
+          }
+        }
+      ]
+    },
+    {
+      "actions": {
+        "update-props": {
+          "node": {
+            "pause-on-idle": false
+          }
+        }
+      },
+      "matches": [
+        {
+          "node": {
+            "name": "~alsa_input.*"
+          }
+        },
+        {
+          "node": {
+            "name": "~alsa_output.*"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
new file mode 100644
index 00000000000..d8f74f32943
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
@@ -0,0 +1,38 @@
+{
+  "properties": {},
+  "rules": [
+    {
+      "actions": {
+        "update-props": {}
+      },
+      "matches": [
+        {
+          "device": {
+            "name": "~bluez_card.*"
+          }
+        }
+      ]
+    },
+    {
+      "actions": {
+        "update-props": {
+          "node": {
+            "pause-on-idle": false
+          }
+        }
+      },
+      "matches": [
+        {
+          "node": {
+            "name": "~bluez_input.*"
+          }
+        },
+        {
+          "node": {
+            "name": "~bluez_output.*"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/nixos/modules/services/desktops/pipewire/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/client-rt.conf.json
new file mode 100644
index 00000000000..701b1916599
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/client-rt.conf.json
@@ -0,0 +1,22 @@
+{
+  "context.properties": {},
+  "context.spa-libs": {
+    "audio.convert.*": "audioconvert/libspa-audioconvert",
+    "support.*": "support/libspa-support"
+  },
+  "context.modules": {
+    "libpipewire-module-rtkit": {
+      "args": {},
+      "flags": [
+        "ifexists",
+        "nofail"
+      ]
+    },
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-client-device": null,
+    "libpipewire-module-adapter": null,
+    "libpipewire-module-metadata": null,
+    "libpipewire-module-session-manager": null
+  }
+}
diff --git a/nixos/modules/services/desktops/pipewire/client.conf.json b/nixos/modules/services/desktops/pipewire/client.conf.json
new file mode 100644
index 00000000000..24c10309329
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/client.conf.json
@@ -0,0 +1,15 @@
+{
+  "context.properties": {},
+  "context.spa-libs": {
+    "audio.convert.*": "audioconvert/libspa-audioconvert",
+    "support.*": "support/libspa-support"
+  },
+  "context.modules": {
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-client-device": null,
+    "libpipewire-module-adapter": null,
+    "libpipewire-module-metadata": null,
+    "libpipewire-module-session-manager": null
+  }
+}
diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/jack.conf.json
new file mode 100644
index 00000000000..0219269f615
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/jack.conf.json
@@ -0,0 +1,19 @@
+{
+  "context.properties": {},
+  "context.spa-libs": {
+    "support.*": "support/libspa-support"
+  },
+  "context.modules": {
+    "libpipewire-module-rtkit": {
+      "args": {},
+      "flags": [
+        "ifexists",
+        "nofail"
+      ]
+    },
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-metadata": null
+  },
+  "jack.properties": {}
+}
diff --git a/nixos/modules/services/desktops/pipewire/media-session.conf.json b/nixos/modules/services/desktops/pipewire/media-session.conf.json
new file mode 100644
index 00000000000..a8fc2d93fb0
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/media-session.conf.json
@@ -0,0 +1,53 @@
+{
+  "context.modules": {
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-adapter": null,
+    "libpipewire-module-client-device": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-metadata": null,
+    "libpipewire-module-rtkit": {
+      "args": {},
+      "flags": [
+        "ifexists",
+        "nofail"
+      ]
+    },
+    "libpipewire-module-session-manager": null
+  },
+  "context.properties": {},
+  "context.spa-libs": {
+    "api.alsa.*": "alsa/libspa-alsa",
+    "api.bluez5.*": "bluez5/libspa-bluez5",
+    "api.libcamera.*": "libcamera/libspa-libcamera",
+    "api.v4l2.*": "v4l2/libspa-v4l2"
+  },
+  "session.modules": {
+    "default": [
+      "flatpak",
+      "portal",
+      "v4l2",
+      "suspend-node",
+      "policy-node"
+    ],
+    "with-alsa": [
+      "with-audio"
+    ],
+    "with-audio": [
+      "metadata",
+      "default-nodes",
+      "default-profile",
+      "default-routes",
+      "alsa-seq",
+      "alsa-monitor"
+    ],
+    "with-jack": [
+      "with-audio"
+    ],
+    "with-pulseaudio": [
+      "with-audio",
+      "bluez5",
+      "restore-stream",
+      "streams-follow-default"
+    ]
+  }
+}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index 81f4762e1e6..b324bfa1b74 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -9,18 +9,36 @@ let
                            && pkgs.stdenv.isx86_64
                            && pkgs.pkgsi686Linux.pipewire != null;
 
+  prioritizeNativeProtocol = {
+    "context.modules" = {
+      "libpipewire-module-protocol-native" = {
+        _priority = -100;
+        _content = null;
+      };
+    };
+  };
+
+  # Use upstream config files passed through spa-json-dump as the base
+  # Patched here as necessary for them to work with this module
+  defaults = {
+    alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
+    bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
+    media-session = recursiveUpdate (builtins.fromJSON (builtins.readFile ./media-session.conf.json)) prioritizeNativeProtocol;
+    v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
+  };
   # Helpers for generating the pipewire JSON config file
   mkSPAValueString = v:
   if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]"
   else if lib.types.attrs.check v then
     "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}"
+  else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\""
   else lib.generators.mkValueStringDefault { } v;
 
   mkSPAKeyValue = attrs: map (def: def.content) (
   lib.sortProperties
     (
       lib.mapAttrsToList
-        (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ] k} = ${mkSPAValueString (v._content or v)}")
+        (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ":" ] k} = ${mkSPAValueString (v._content or v)}")
         attrs
     )
   );
@@ -51,272 +69,41 @@ in {
         '';
       };
 
-      config = mkOption {
-        type = types.attrs;
-        description = ''
-          Configuration for the media session core.
-        '';
-        default = {
-          # media-session config file
-          properties = {
-            # Properties to configure the session and some
-            # modules
-            #mem.mlock-all = false;
-            #context.profile.modules = "default,rtkit";
-          };
-
-          spa-libs = {
-            # Mapping from factory name to library.
-            "api.bluez5.*" = "bluez5/libspa-bluez5";
-            "api.alsa.*" = "alsa/libspa-alsa";
-            "api.v4l2.*" = "v4l2/libspa-v4l2";
-            "api.libcamera.*" = "libcamera/libspa-libcamera";
-          };
-
-          modules = {
-            # These are the modules that are enabled when a file with
-            # the key name is found in the media-session.d config directory.
-            # the default bundle is always enabled.
-
-            default = [
-              "flatpak"			# manages flatpak access
-              "portal"			# manage portal permissions
-              "v4l2"			# video for linux udev detection
-              #"libcamera"		# libcamera udev detection
-              "suspend-node"		# suspend inactive nodes
-              "policy-node"		# configure and link nodes
-              #"metadata"		# export metadata API
-              #"default-nodes"		# restore default nodes
-              #"default-profile"	# restore default profiles
-              #"default-routes"		# restore default route
-              #"streams-follow-default"	# move streams when default changes
-              #"alsa-seq"		# alsa seq midi support
-              #"alsa-monitor"		# alsa udev detection
-              #"bluez5"			# bluetooth support
-              #"restore-stream"		# restore stream settings
-            ];
-            "with-audio" = [
-              "metadata"
-              "default-nodes"
-              "default-profile"
-              "default-routes"
-              "alsa-seq"
-              "alsa-monitor"
-            ];
-            "with-alsa" = [
-              "with-audio"
-            ];
-            "with-jack" = [
-              "with-audio"
-            ];
-            "with-pulseaudio" = [
-              "with-audio"
-              "bluez5"
-              "restore-stream"
-              "streams-follow-default"
-            ];
-          };
+      config = {
+        media-session = mkOption {
+          type = types.attrs;
+          description = ''
+            Configuration for the media session core. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf
+          '';
+          default = {};
         };
-      };
-
-      alsaMonitorConfig = mkOption {
-        type = types.attrs;
-        description = ''
-          Configuration for the alsa monitor.
-        '';
-        default = {
-          # alsa-monitor config file
-          properties = {
-            #alsa.jack-device = true
-          };
 
-          rules = [
-          # an array of matches/actions to evaluate
-          {
-            # rules for matching a device or node. It is an array of
-            # properties that all need to match the regexp. If any of the
-            # matches work, the actions are executed for the object.
-            matches = [
-              {
-                # this matches all cards
-                device.name = "~alsa_card.*";
-              }
-            ];
-            actions = {
-              # actions can update properties on the matched object.
-              update-props = {
-                api.alsa.use-acp = true;
-                #api.alsa.use-ucm = true;
-                #api.alsa.soft-mixer = false;
-                #api.alsa.ignore-dB = false;
-                #device.profile-set = "profileset-name";
-                #device.profile = "default profile name";
-                api.acp.auto-profile = false;
-                api.acp.auto-port = false;
-                #device.nick = "My Device";
-              };
-            };
-          }
-          {
-            matches = [
-              {
-                # matches all sinks
-                node.name = "~alsa_input.*";
-              }
-              {
-                # matches all sources
-                node.name = "~alsa_output.*";
-              }
-            ];
-            actions = {
-              update-props = {
-                #node.nick = 			"My Node";
-                #node.nick = 			null;
-                #priority.driver = 		100;
-                #priority.session = 		100;
-                #node.pause-on-idle = 		false;
-                #resample.quality = 		4;
-                #channelmix.normalize =		false;
-                #channelmix.mix-lfe = 		false;
-                #audio.channels = 		2;
-                #audio.format = 		"S16LE";
-                #audio.rate = 			44100;
-                #audio.position = 		"FL,FR";
-                #api.alsa.period-size =         1024;
-                #api.alsa.headroom =            0;
-                #api.alsa.disable-mmap =        false;
-                #api.alsa.disable-batch =       false;
-              };
-            };
-          }
-          ];
+        alsa-monitor = mkOption {
+          type = types.attrs;
+          description = ''
+            Configuration for the alsa monitor. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf
+          '';
+          default = {};
         };
-      };
-
-      bluezMonitorConfig = mkOption {
-        type = types.attrs;
-        description = ''
-          Configuration for the bluez5 monitor.
-        '';
-        default = {
-          # bluez-monitor config file
-          properties = {
-            # msbc is not expected to work on all headset + adapter combinations.
-            #bluez5.msbc-support = true;
-            #bluez5.sbc-xq-support = true;
 
-            # Enabled headset roles (default: [ hsp_hs hfp_ag ]), this
-            # property only applies to native backend. Currently some headsets
-            # (Sony WH-1000XM3) are not working with both hsp_ag and hfp_ag
-            # enabled, disable either hsp_ag or hfp_ag to work around it.
-            #
-            # Supported headset roles: hsp_hs (HSP Headset),
-            #                          hsp_ag (HSP Audio Gateway),
-            #                          hfp_ag (HFP Audio Gateway)
-            #bluez5.headset-roles = [ "hsp_hs" "hsp_ag" "hfp_ag" ];
-
-            # Enabled A2DP codecs (default: all)
-            #bluez5.codecs = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ];
-          };
-
-          rules = [
-          # an array of matches/actions to evaluate
-          {
-            # rules for matching a device or node. It is an array of
-            # properties that all need to match the regexp. If any of the
-            # matches work, the actions are executed for the object.
-            matches = [
-              {
-                # this matches all cards
-                device.name = "~bluez_card.*";
-              }
-            ];
-            actions = {
-              # actions can update properties on the matched object.
-              update-props = {
-                #device.nick = 			"My Device";
-              };
-            };
-          }
-          {
-            matches = [
-              {
-                # matches all sinks
-                node.name = "~bluez_input.*";
-              }
-              {
-                # matches all sources
-                node.name = "~bluez_output.*";
-              }
-            ];
-            actions = {
-              update-props = {
-                #node.nick = 			"My Node"
-                #node.nick = 			null;
-                #priority.driver = 		100;
-                #priority.session = 		100;
-                #node.pause-on-idle = 		false;
-                #resample.quality = 		4;
-                #channelmix.normalize =		false;
-                #channelmix.mix-lfe = 		false;
-              };
-            };
-          }
-          ];
+        bluez-monitor = mkOption {
+          type = types.attrs;
+          description = ''
+            Configuration for the bluez5 monitor. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf
+          '';
+          default = {};
         };
-      };
-
-      v4l2MonitorConfig = mkOption {
-        type = types.attrs;
-        description = ''
-          Configuration for the V4L2 monitor.
-        '';
-        default = {
-          # v4l2-monitor config file
-          properties = {
-          };
 
-          rules = [
-            # an array of matches/actions to evaluate
-            {
-              # rules for matching a device or node. It is an array of
-              # properties that all need to match the regexp. If any of the
-              # matches work, the actions are executed for the object.
-              matches = [
-                {
-                  # this matches all devices
-                  device.name = "~v4l2_device.*";
-                }
-              ];
-              actions = {
-                # actions can update properties on the matched object.
-                update-props = {
-                  #device.nick = 			"My Device";
-                };
-              };
-            }
-            {
-              matches = [
-                {
-                  # matches all sinks
-                  node.name = "~v4l2_input.*";
-                }
-                {
-                  # matches all sources
-                  node.name = "~v4l2_output.*";
-                }
-              ];
-              actions = {
-                update-props = {
-                  #node.nick = 			"My Node";
-                  #node.nick = 			null;
-                  #priority.driver = 		100;
-                  #priority.session = 		100;
-                  #node.pause-on-idle = 		true;
-                };
-              };
-            }
-          ];
+        v4l2-monitor = mkOption {
+          type = types.attrs;
+          description = ''
+            Configuration for the V4L2 monitor. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf
+          '';
+          default = {};
         };
       };
     };
@@ -325,16 +112,16 @@ in {
   ###### implementation
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
-    services.pipewire.sessionManagerExecutable = "${cfg.package}/bin/pipewire-media-session";
+    services.pipewire.sessionManagerExecutable = builtins.unsafeDiscardStringContext "${cfg.package}/bin/pipewire-media-session";
 
-    environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON cfg.config; };
-    environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON cfg.v4l2MonitorConfig; };
+    environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON (recursiveUpdate defaults.media-session cfg.config.media-session); };
+    environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON (recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor); };
 
     environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = ""; };
-    environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON cfg.alsaMonitorConfig; };
+    environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON (recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor); };
 
     environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf config.services.pipewire.pulse.enable { text = ""; };
-    environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON cfg.bluezMonitorConfig; };
+    environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON (recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor); };
 
     environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { text = ""; };
   };
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
new file mode 100644
index 00000000000..5fe6ec2b064
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
@@ -0,0 +1,27 @@
+{
+  "context.properties": {},
+  "context.spa-libs": {
+    "audio.convert.*": "audioconvert/libspa-audioconvert",
+    "support.*": "support/libspa-support"
+  },
+  "context.modules": {
+    "libpipewire-module-rtkit": {
+      "args": {},
+      "flags": [
+        "ifexists",
+        "nofail"
+      ]
+    },
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-adapter": null,
+    "libpipewire-module-metadata": null,
+    "libpipewire-module-protocol-pulse": {
+      "args": {
+        "server.address": [
+          "unix:native"
+        ]
+      }
+    }
+  }
+}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/pipewire.conf.json
new file mode 100644
index 00000000000..b8e23e04c8a
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/pipewire.conf.json
@@ -0,0 +1,54 @@
+{
+  "context.properties": {
+    "link.max-buffers": 16,
+    "core.daemon": true,
+    "core.name": "pipewire-0"
+  },
+  "context.spa-libs": {
+    "audio.convert.*": "audioconvert/libspa-audioconvert",
+    "api.alsa.*": "alsa/libspa-alsa",
+    "api.v4l2.*": "v4l2/libspa-v4l2",
+    "api.libcamera.*": "libcamera/libspa-libcamera",
+    "api.bluez5.*": "bluez5/libspa-bluez5",
+    "api.vulkan.*": "vulkan/libspa-vulkan",
+    "api.jack.*": "jack/libspa-jack",
+    "support.*": "support/libspa-support"
+  },
+  "context.modules": {
+    "libpipewire-module-rtkit": {
+      "args": {},
+      "flags": [
+        "ifexists",
+        "nofail"
+      ]
+    },
+    "libpipewire-module-protocol-native": null,
+    "libpipewire-module-profiler": null,
+    "libpipewire-module-metadata": null,
+    "libpipewire-module-spa-device-factory": null,
+    "libpipewire-module-spa-node-factory": null,
+    "libpipewire-module-client-node": null,
+    "libpipewire-module-client-device": null,
+    "libpipewire-module-portal": null,
+    "libpipewire-module-access": {
+      "args": {}
+    },
+    "libpipewire-module-adapter": null,
+    "libpipewire-module-link-factory": null,
+    "libpipewire-module-session-manager": null
+  },
+  "context.objects": {
+    "spa-node-factory": {
+      "args": {
+        "factory.name": "support.node.driver",
+        "node.name": "Dummy-Driver",
+        "priority.driver": 8000
+      }
+    }
+  },
+  "context.exec": {
+    "/nix/store/1q65a09arb7r4sdfz657p473kn3lqknk-pipewire-0.3.22/bin/pipewire-media-session": {
+      "args": ""
+    }
+  }
+}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 044120de7c7..77aa7043ee4 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -18,11 +18,40 @@ let
     ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire"
   '';
 
+  prioritizeNativeProtocol = {
+    "context.modules" = {
+      "libpipewire-module-protocol-native" = {
+        _priority = -100;
+        _content = null;
+      };
+    };
+  };
+
+  sessionManagerInvocation = {
+    "context.exec" = {
+      "${cfg.sessionManagerExecutable}" = {
+        args = "${lib.concatStringsSep " " cfg.sessionManagerArguments}";
+      };
+    };
+  };
+
+  # Use upstream config files passed through spa-json-dump as the base
+  # Patched here as necessary for them to work with this module
+  defaults = {
+    client = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client.conf.json)) prioritizeNativeProtocol;
+    client-rt = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client-rt.conf.json)) prioritizeNativeProtocol;
+    jack = recursiveUpdate (builtins.fromJSON (builtins.readFile ./jack.conf.json)) prioritizeNativeProtocol;
+    # Remove session manager invocation from the upstream generated file, it points to the wrong path
+    pipewire = recursiveUpdate ((removeAttrs (builtins.fromJSON (builtins.readFile ./pipewire.conf.json)) ["context.exec"]) // sessionManagerInvocation) prioritizeNativeProtocol;
+    pipewire-pulse = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json)) prioritizeNativeProtocol;
+  };
+
   # Helpers for generating the pipewire JSON config file
   mkSPAValueString = v:
   if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]"
   else if lib.types.attrs.check v then
     "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}"
+  else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\""
   else lib.generators.mkValueStringDefault { } v;
 
   mkSPAKeyValue = attrs: map (def: def.content) (
@@ -64,110 +93,50 @@ in {
         '';
       };
 
-      config = mkOption {
-        type = types.attrs;
-        description = ''
-          Configuration for the pipewire daemon.
-        '';
-        default = {
-          properties = {
-            ## set-prop is used to configure properties in the system
-            #
-            # "library.name.system" = "support/libspa-support";
-            # "context.data-loop.library.name.system" = "support/libspa-support";
-            "link.max-buffers" = 16; # version < 3 clients can't handle more than 16
-            #"mem.allow-mlock" = false;
-            #"mem.mlock-all" = true;
-            ## https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/pipewire.h#L93
-            #"log.level" = 2; # 5 is trace, which is verbose as hell, default is 2 which is warnings, 4 is debug output, 3 is info
-
-            ## Properties for the DSP configuration
-            #
-            #"default.clock.rate" = 48000;
-            #"default.clock.quantum" = 1024;
-            #"default.clock.min-quantum" = 32;
-            #"default.clock.max-quantum" = 8192;
-            #"default.video.width" = 640;
-            #"default.video.height" = 480;
-            #"default.video.rate.num" = 25;
-            #"default.video.rate.denom" = 1;
-          };
-
-          spa-libs = {
-            ## add-spa-lib <factory-name regex> <library-name>
-            #
-            # used to find spa factory names. It maps an spa factory name
-            # regular expression to a library name that should contain
-            # that factory.
-            #
-            "audio.convert*" = "audioconvert/libspa-audioconvert";
-            "api.alsa.*" = "alsa/libspa-alsa";
-            "api.v4l2.*" = "v4l2/libspa-v4l2";
-            "api.libcamera.*" = "libcamera/libspa-libcamera";
-            "api.bluez5.*" = "bluez5/libspa-bluez5";
-            "api.vulkan.*" = "vulkan/libspa-vulkan";
-            "api.jack.*" = "jack/libspa-jack";
-            "support.*" = "support/libspa-support";
-            # "videotestsrc" = "videotestsrc/libspa-videotestsrc";
-            # "audiotestsrc" = "audiotestsrc/libspa-audiotestsrc";
-          };
-
-          modules = {
-            ##  <module-name> = { [args = "<key>=<value> ..."]
-            #                     [flags = ifexists] }
-            #                     [flags = [ifexists]|[nofail]}
-            #
-            # Loads a module with the given parameters.
-            # If ifexists is given, the module is ignoed when it is not found.
-            # If nofail is given, module initialization failures are ignored.
-            #
-            libpipewire-module-rtkit = {
-              args = {
-                #rt.prio = 20;
-                #rt.time.soft = 200000;
-                #rt.time.hard = 200000;
-                #nice.level = -11;
-              };
-              flags = "ifexists|nofail";
-            };
-            libpipewire-module-protocol-native = { _priority = -100; _content = "null"; };
-            libpipewire-module-profiler = "null";
-            libpipewire-module-metadata = "null";
-            libpipewire-module-spa-device-factory = "null";
-            libpipewire-module-spa-node-factory = "null";
-            libpipewire-module-client-node = "null";
-            libpipewire-module-client-device = "null";
-            libpipewire-module-portal = "null";
-            libpipewire-module-access = {
-              args.access = {
-                allowed = ["${builtins.unsafeDiscardStringContext cfg.sessionManagerExecutable}"];
-                rejected = [];
-                restricted = [];
-                force = "flatpak";
-              };
-            };
-            libpipewire-module-adapter = "null";
-            libpipewire-module-link-factory = "null";
-            libpipewire-module-session-manager = "null";
-          };
-
-          objects = {
-            ## create-object [-nofail] <factory-name> [<key>=<value> ...]
-            #
-            # Creates an object from a PipeWire factory with the given parameters.
-            # If -nofail is given, errors are ignored (and no object is created)
-            #
-          };
-
-
-          exec = {
-            ## exec <program-name>
-            #
-            # Execute the given program. This is usually used to start the
-            # session manager. run the session manager with -h for options
-            #
-            "${builtins.unsafeDiscardStringContext cfg.sessionManagerExecutable}" = { args = "\"${lib.concatStringsSep " " cfg.sessionManagerArguments}\""; };
-          };
+      config = {
+        client = mkOption {
+          type = types.attrs;
+          default = {};
+          description = ''
+            Configuration for pipewire clients. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/client.conf.in
+          '';
+        };
+
+        client-rt = mkOption {
+          type = types.attrs;
+          default = {};
+          description = ''
+            Configuration for realtime pipewire clients. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/client-rt.conf.in
+          '';
+        };
+
+        jack = mkOption {
+          type = types.attrs;
+          default = {};
+          description = ''
+            Configuration for the pipewire daemon's jack module. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/jack.conf.in
+          '';
+        };
+
+        pipewire = mkOption {
+          type = types.attrs;
+          default = {};
+          description = ''
+            Configuration for the pipewire daemon. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/pipewire.conf.in
+          '';
+        };
+
+        pipewire-pulse = mkOption {
+          type = types.attrs;
+          default = {};
+          description = ''
+            Configuration for the pipewire-pulse daemon. For details see
+            https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/pipewire-pulse.conf.in
+          '';
         };
       };
 
@@ -253,13 +222,16 @@ in {
       source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf";
     };
 
+    environment.etc."pipewire/client.conf" = { text = toSPAJSON (recursiveUpdate defaults.client cfg.config.client); };
+    environment.etc."pipewire/client-rt.conf" = { text = toSPAJSON (recursiveUpdate defaults.client-rt cfg.config.client-rt); };
+    environment.etc."pipewire/jack.conf" = { text = toSPAJSON (recursiveUpdate defaults.jack cfg.config.jack); };
+    environment.etc."pipewire/pipewire.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire cfg.config.pipewire); };
+    environment.etc."pipewire/pipewire-pulse.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse); };
+
     environment.sessionVariables.LD_LIBRARY_PATH =
       lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire";
 
     # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554
-    systemd.user.services.pipewire.environment = {
-      "PIPEWIRE_LINK_PASSIVE" = "1";
-      "PIPEWIRE_CONFIG_FILE" = pkgs.writeText "pipewire.conf" (toSPAJSON cfg.config);
-    };
+    systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1";
   };
 }
diff --git a/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json b/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
new file mode 100644
index 00000000000..ca404fabbfc
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
@@ -0,0 +1,38 @@
+{
+  "properties": {},
+  "rules": [
+    {
+      "actions": {
+        "update-props": {}
+      },
+      "matches": [
+        {
+          "device": {
+            "name": "~v4l2_device.*"
+          }
+        }
+      ]
+    },
+    {
+      "actions": {
+        "update-props": {
+          "node": {
+            "pause-on-idle": false
+          }
+        }
+      },
+      "matches": [
+        {
+          "node": {
+            "name": "~v4l2_input.*"
+          }
+        },
+        {
+          "node": {
+            "name": "~v4l2_output.*"
+          }
+        }
+      ]
+    }
+  ]
+}