From 1e9b3c1af1e30618a267d0c2a8c7038696d6f71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 27 Jul 2024 17:37:17 +0200 Subject: [PATCH] nixos/speechd: avoid by default on headless systems Incidentally this also fixes tests like nixosTests.installer.simple /cc PR #329658 --- nixos/modules/services/accessibility/speechd.nix | 5 ++--- nixos/modules/services/misc/graphical-desktop.nix | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/accessibility/speechd.nix b/nixos/modules/services/accessibility/speechd.nix index 811535e8baf1d..165be86346ccb 100644 --- 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 index c8fe0d921c6ad..246310195edc2 100644 --- 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 = {