Merge #330440: nixos/speechd: avoid by default on headless systems

...into staging-next
NixOS · Jul 28, 2024 · ca0d8e5 · ca0d8e5
2 parents 442b344 + 1e9b3c1
commit ca0d8e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/nixos/modules/services/accessibility/speechd.nix b/nixos/modules/services/accessibility/speechd.nix
@@ -16,9 +16,8 @@ in
 {
  options.services.speechd = {
  # FIXME: figure out how to deprecate this EXTREMELY CAREFULLY
- enable = mkEnableOption "speech-dispatcher speech synthesizer daemon" // {
- default = true;
- };
+ # default guessed conservatively in ../misc/graphical-desktop.nix
+ enable = mkEnableOption "speech-dispatcher speech synthesizer daemon";
  package = mkPackageOption pkgs "speechd" { };
  };
 

diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix
@@ -42,6 +42,8 @@ in
 
  programs.gnupg.agent.pinentryPackage = lib.mkOverride 1100 pkgs.pinentry-gnome3;
 
+ services.speechd.enable = lib.mkDefault true;
+
  systemd.defaultUnit = lib.mkIf (xcfg.autorun || dmcfg.enable) "graphical.target";
 
  xdg = {