nixos/orca: init, enable by default on Plasma (#339069)

authored by K900 and committed by GitHub 1e41473c 4c7acf93

+37 -3
+1
nixos/modules/module-list.nix
··· 363 ./security/systemd-confinement.nix 364 ./security/tpm2.nix 365 ./security/wrappers/default.nix 366 ./services/accessibility/speechd.nix 367 ./services/admin/docuum.nix 368 ./services/admin/meshcentral.nix
··· 363 ./security/systemd-confinement.nix 364 ./security/tpm2.nix 365 ./security/wrappers/default.nix 366 + ./services/accessibility/orca.nix 367 ./services/accessibility/speechd.nix 368 ./services/admin/docuum.nix 369 ./services/admin/meshcentral.nix
+25
nixos/modules/services/accessibility/orca.nix
···
··· 1 + { 2 + config, 3 + lib, 4 + pkgs, 5 + ... 6 + }: 7 + let 8 + cfg = config.services.orca; 9 + inherit (lib) 10 + mkEnableOption 11 + mkIf 12 + mkPackageOption 13 + ; 14 + in 15 + { 16 + options.services.orca = { 17 + enable = mkEnableOption "Orca screen reader"; 18 + package = mkPackageOption pkgs "orca" { }; 19 + }; 20 + 21 + config = mkIf cfg.enable { 22 + environment.systemPackages = [ cfg.package ]; 23 + services.speechd.enable = true; 24 + }; 25 + }
+3
nixos/modules/services/desktop-managers/plasma6.nix
··· 245 xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde]; 246 services.pipewire.enable = mkDefault true; 247 248 services.displayManager = { 249 sessionPackages = [kdePackages.plasma-workspace]; 250 defaultSession = mkDefault "plasma";
··· 245 xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde]; 246 services.pipewire.enable = mkDefault true; 247 248 + # Enable screen reader by default 249 + services.orca.enable = mkDefault true; 250 + 251 services.displayManager = { 252 sessionPackages = [kdePackages.plasma-workspace]; 253 defaultSession = mkDefault "plasma";
+2 -1
nixos/modules/services/x11/desktop-managers/cinnamon.nix
··· 172 ] ++ utils.removePackagesByName [ 173 # accessibility 174 onboard 175 - orca 176 177 # theme 178 sound-theme-freedesktop ··· 198 buildPortalsInGnome = false; 199 }) 200 ]; 201 202 xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; 203
··· 172 ] ++ utils.removePackagesByName [ 173 # accessibility 174 onboard 175 176 # theme 177 sound-theme-freedesktop ··· 197 buildPortalsInGnome = false; 198 }) 199 ]; 200 + 201 + services.orca.enable = mkDefault (notExcluded pkgs.orca); 202 203 xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; 204
+2 -1
nixos/modules/services/x11/desktop-managers/gnome.nix
··· 357 isSystem = true; 358 }; 359 360 fonts.packages = with pkgs; [ 361 cantarell-fonts 362 dejavu_fonts ··· 380 pkgs.gnome-shell-extensions 381 pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. 382 pkgs.gnome-user-docs 383 - pkgs.orca 384 pkgs.glib # for gsettings program 385 pkgs.gnome-menus 386 pkgs.gtk3.out # for gtk-launch program
··· 357 isSystem = true; 358 }; 359 360 + services.orca.enable = notExcluded pkgs.orca; 361 + 362 fonts.packages = with pkgs; [ 363 cantarell-fonts 364 dejavu_fonts ··· 382 pkgs.gnome-shell-extensions 383 pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. 384 pkgs.gnome-user-docs 385 pkgs.glib # for gsettings program 386 pkgs.gnome-menus 387 pkgs.gtk3.out # for gtk-launch program
+1 -1
nixos/modules/services/x11/desktop-managers/pantheon.nix
··· 175 # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 176 pkgs.pantheon.mutter 177 ]; 178 systemd.packages = with pkgs; [ 179 gnome-session 180 pantheon.gala ··· 211 adwaita-icon-theme 212 gtk3.out # for gtk-launch program 213 onboard 214 - orca # elementary/greeter#668 215 sound-theme-freedesktop 216 xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ 217 ]) ++ (with pkgs.pantheon; [
··· 175 # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 176 pkgs.pantheon.mutter 177 ]; 178 + services.orca.enable = mkDefault (notExcluded pkgs.orca); 179 systemd.packages = with pkgs; [ 180 gnome-session 181 pantheon.gala ··· 212 adwaita-icon-theme 213 gtk3.out # for gtk-launch program 214 onboard 215 sound-theme-freedesktop 216 xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ 217 ]) ++ (with pkgs.pantheon; [
+3
nixos/modules/services/x11/desktop-managers/plasma5.nix
··· 357 pkgs.media-player-info 358 ]; 359 360 services.displayManager.sddm = { 361 theme = mkDefault "breeze"; 362 };
··· 357 pkgs.media-player-info 358 ]; 359 360 + # Enable screen reader by default 361 + services.orca.enable = mkDefault true; 362 + 363 services.displayManager.sddm = { 364 theme = mkDefault "breeze"; 365 };