diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index ce58c4dc95b0..469c6a9f338c 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -209,6 +209,9 @@ following incompatible changes:
For stateVersion = "17.09" or lower the old behavior is preserved.
+
+ sound.enable now defaults to false.
+
matrix-synapse uses postgresql by default instead of sqlite.
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index a82ee63fd0cd..0e0744a52e42 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -603,6 +603,10 @@ $bootLoaderConfig
# Enable CUPS to print documents.
# services.printing.enable = true;
+ # Enable sound.
+ # sound.enable = true;
+ # hardware.pulseaudio.enable = true;
+
# Enable the X11 windowing system.
# services.xserver.enable = true;
# services.xserver.layout = "us";
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index acf48d3c3d03..161d873686a8 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -21,7 +21,7 @@ in
enable = mkOption {
type = types.bool;
- default = true;
+ defaultText = "!versionAtLeast system.stateVersion \"18.03\"";
description = ''
Whether to enable ALSA sound.
'';
@@ -78,7 +78,11 @@ in
###### implementation
- config = mkIf config.sound.enable {
+ config = mkMerge [
+ ({
+ sound.enable = mkDefault (!versionAtLeast config.system.stateVersion "18.03");
+ })
+ (mkIf config.sound.enable {
environment.systemPackages = [ alsaUtils ];
@@ -124,6 +128,6 @@ in
];
};
- };
+ })];
}