From ff2c87a8cfa3e4991b81ddc9cae059f4bc6bf1a4 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 11 Sep 2017 21:59:23 +0200 Subject: [PATCH 1/4] pulseaudio: enable by default in NixOS --- nixos/modules/config/pulseaudio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index a9c5fc75660d3..b7c44dcdc196b 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -87,7 +87,7 @@ in { hardware.pulseaudio = { enable = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to enable the PulseAudio sound server. ''; From 7de4990f51faee605a7c2bfcd3cf142220096b9c Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 12 Sep 2017 21:27:03 +0200 Subject: [PATCH 2/4] only enable pulseaudio by default if alsa is also enabled --- nixos/modules/config/pulseaudio.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index b7c44dcdc196b..99696235a80aa 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -87,7 +87,8 @@ in { hardware.pulseaudio = { enable = mkOption { type = types.bool; - default = true; + default = config.sound.enable; + defaultText = "config.sound.enable"; description = '' Whether to enable the PulseAudio sound server. ''; From 4f83da8ed79ec56b0f2e66cf0b998abad9c50da7 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 21 Feb 2018 21:51:41 +0100 Subject: [PATCH 3/4] nixos: clarify documentation of sound.enable --- nixos/modules/services/audio/alsa.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index acf48d3c3d032..69e82fb830035 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -23,7 +23,8 @@ in type = types.bool; default = true; description = '' - Whether to enable ALSA sound. + Whether to enable ALSA sound. Will also enable pulseaudio unless + is set to false. ''; }; From 452a8eca3b9c20f40111b00cb6bb5ea30d9fb5e3 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 21 Feb 2018 22:02:18 +0100 Subject: [PATCH 4/4] pulseaudio-by-default: implement fpletz' review suggestion --- nixos/modules/config/pulseaudio.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 99696235a80aa..0fb3a9119e456 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -87,7 +87,6 @@ in { hardware.pulseaudio = { enable = mkOption { type = types.bool; - default = config.sound.enable; defaultText = "config.sound.enable"; description = '' Whether to enable the PulseAudio sound server. @@ -209,6 +208,8 @@ in { source = clientConf; }; + hardware.pulseaudio.enable = mkDefault config.sound.enable; + hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa"; }