diff options
author | Jan Solanti <jhs@psonet.com> | 2022-02-17 17:39:53 +0200 |
---|---|---|
committer | Jan Solanti <jhs@psonet.com> | 2022-02-17 17:39:53 +0200 |
commit | 394c6f79497f7032c91ba69510c7f7aeb794b3b1 (patch) | |
tree | e3cc263dad0df7fd2ddcf80747a7881b0a34bb42 /nixos | |
parent | afbb3ca9ef1a2ca66f96d7447e79030d8b5dbf49 (diff) | |
download | nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.tar nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.tar.gz nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.tar.bz2 nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.tar.lz nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.tar.xz nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.tar.zst nixlib-394c6f79497f7032c91ba69510c7f7aeb794b3b1.zip |
nixos/pipewire: use standalone config when no session manger enabled
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/desktops/pipewire/pipewire.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index c3cfd46e61c2..59e9342a6ea1 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -25,15 +25,18 @@ let client = lib.importJSON ./daemon/client.conf.json; client-rt = lib.importJSON ./daemon/client-rt.conf.json; jack = lib.importJSON ./daemon/jack.conf.json; + minimal = lib.importJSON ./daemon/minimal.conf.json; pipewire = lib.importJSON ./daemon/pipewire.conf.json; pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; }; + useSessionManager = cfg.wireplumber.enable || cfg.media-session.enable; + configs = { client = recursiveUpdate defaults.client cfg.config.client; client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt; jack = recursiveUpdate defaults.jack cfg.config.jack; - pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire; + pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire; pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; }; in { |