diff options
| author | K900 <me@0upti.me> | 2022-02-12 16:09:44 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2022-02-19 19:52:55 +0300 |
| commit | e67dd381d33681ce876030db03bc1e58b6ad075d (patch) | |
| tree | e73c259caf1952ba59651d25be106aad083a450e /nixos/modules/services | |
| parent | d4f94b3960f26b21ee366f426931ff1123512c0c (diff) | |
| download | nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.tar nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.tar.gz nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.tar.bz2 nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.tar.lz nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.tar.xz nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.tar.zst nixpkgs-e67dd381d33681ce876030db03bc1e58b6ad075d.zip | |
nixos/pipewire: default to wireplumber
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/desktops/pipewire/pipewire-media-session.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/pipewire/wireplumber.nix | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index f7a03a4a3ea..109c91134b9 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -38,9 +38,8 @@ in { services.pipewire.media-session = { enable = mkOption { type = types.bool; - default = config.services.pipewire.enable; - defaultText = literalExpression "config.services.pipewire.enable"; - description = "Example pipewire session manager"; + default = false; + description = "Whether to enable the deprecated example Pipewire session manager"; }; package = mkOption { diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index ad96dc1f974..52ec17b95db 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -8,15 +8,18 @@ in options = { services.pipewire.wireplumber = { - enable = lib.mkEnableOption "A modular session / policy manager for PipeWire"; + enable = lib.mkOption { + type = lib.types.bool; + default = config.services.pipewire.enable; + defaultText = lib.literalExpression "config.services.pipewire.enable"; + description = "Whether to enable Wireplumber, a modular session / policy manager for PipeWire"; + }; package = lib.mkOption { type = lib.types.package; default = pkgs.wireplumber; defaultText = lib.literalExpression "pkgs.wireplumber"; - description = '' - The wireplumber derivation to use. - ''; + description = "The wireplumber derivation to use."; }; }; }; |