Unverified Commit 1e41473c authored by K900's avatar K900 Committed by GitHub
Browse files

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

parents 4c7acf93 5a4ee0a5

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ 
  ./security/systemd-confinement.nix

  ./security/tpm2.nix

  ./security/wrappers/default.nix

  ./services/accessibility/orca.nix

  ./services/accessibility/speechd.nix

  ./services/admin/docuum.nix

  ./services/admin/meshcentral.nix

nixos/modules/services/accessibility/orca.nix

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:

let

  cfg = config.services.orca;

  inherit (lib)

    mkEnableOption

    mkIf

    mkPackageOption

    ;

in

{

  options.services.orca = {

    enable = mkEnableOption "Orca screen reader";

    package = mkPackageOption pkgs "orca" { };

  };



  config = mkIf cfg.enable {

    environment.systemPackages = [ cfg.package ];

    services.speechd.enable = true;

  };

}

nixos/modules/services/desktop-managers/plasma6.nix

+3 −0
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ in { 
    xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde];

    services.pipewire.enable = mkDefault true;



    # Enable screen reader by default

    services.orca.enable = mkDefault true;



    services.displayManager = {

      sessionPackages = [kdePackages.plasma-workspace];

      defaultSession = mkDefault "plasma";

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ in 
      ] ++ utils.removePackagesByName [

        # accessibility

        onboard

        orca



        # theme

        sound-theme-freedesktop
@@ -199,6 +198,8 @@ in 
        })

      ];



      services.orca.enable = mkDefault (notExcluded pkgs.orca);



      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];



      # Override GSettings schemas

nixos/modules/services/x11/desktop-managers/gnome.nix

+2 −1
Original line number Diff line number Diff line
@@ -357,6 +357,8 @@ in 
        isSystem = true;

      };



      services.orca.enable = notExcluded pkgs.orca;



      fonts.packages = with pkgs; [

        cantarell-fonts

        dejavu_fonts
@@ -380,7 +382,6 @@ in 
            pkgs.gnome-shell-extensions

            pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.

            pkgs.gnome-user-docs

            pkgs.orca

            pkgs.glib # for gsettings program

            pkgs.gnome-menus

            pkgs.gtk3.out # for gtk-launch program