Merge master into staging-next

    githubId = 88038050;

    name = "Souvik Sen";

  };

  iogamaster = {

    email = "iogamastercode+nixpkgs@gmail.com";

    name = "IogaMaster";

    github = "iogamaster";

    githubId = 67164465;

  };

  ionutnechita = {

    email = "ionut_n2001@yahoo.com";

    github = "ionutnechita";

    githubId = 7839004;

    name = "Dmitriy Pleshevskiy";

  };

  pluiedev = {

    email = "hi@pluie.me";

    github = "pluiedev";

    githubId = 22406910;

    name = "Leah Amelia Chen";

  };

  plumps = {

    email = "maks.bronsky@web.de";

    github = "plumps";

    github = "SnO2WMaN";

    githubId = 15155608;

  };

  snowflake = {

    email = "snowflake@pissmail.com";

    name = "Snowflake";

    github = "snf1k";

    githubId = 149651684;

    matrix = "@snowflake:mozilla.org";

    keys = [{

      fingerprint = "8223 7B6F 2FF4 8F16 B652  6CA3 934F 9E5F 9701 2C0B";

    }];

  };

  snpschaaf = {

    email = "philipe.schaaf@secunet.com";

    name = "Philippe Schaaf";

It is possible to install custom [ XKB

](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts

using the option `services.xserver.extraLayouts`.

using the option `services.xserver.xkb.extraLayouts`.

As a first example, we are going to create a layout based on the basic

US layout, with an additional layer to type some greek symbols by

A minimal layout specification must include the following:

```nix

services.xserver.extraLayouts.us-greek = {

services.xserver.xkb.extraLayouts.us-greek = {

  description = "US layout with alt-gr greek";

  languages   = [ "eng" ];

  symbolsFile = /yourpath/symbols/us-greek;

As before, to install the layout do

```nix

services.xserver.extraLayouts.media = {

services.xserver.xkb.extraLayouts.media = {

  description  = "Multimedia keys remapping";

  languages    = [ "eng" ];

  symbolsFile  = /path/to/media-key;

  order, or relying on `mkBefore` and `mkAfter`, but may impact users calling

  `mkOrder n` with n ≤ 400.

- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`.

- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.extraLayouts` is now `services.xserver.xkb.extraLayouts`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`.

- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.

- The `services.mtr-exporter.target` has been removed in favor of `services.mtr-exporter.jobs` which allows specifying multiple targets.

- `blender-with-packages` has been deprecated in favor of `blender.withPackages`, for example `blender.withPackages (ps: [ps.bpycv])`. It behaves similarly to `python3.withPackages`.

- Setting `nixpkgs.config` options while providing an external `pkgs` instance will now raise an error instead of silently ignoring the options. NixOS modules no longer set `nixpkgs.config` to accomodate this. This specifically affects `services.locate`, `services.xserver.displayManager.lightdm.greeters.tiny` and `programs.firefox` NixOS modules. No manual intervention should be required in most cases, however, configurations relying on those modules affecting packages outside the system environment should switch to explicit overlays.

- `service.borgmatic.settings.location` and `services.borgmatic.configurations.<name>.location` are deprecated, please move your options out of sections to the global scope.

  ./virtualisation/docker.nix

  ./virtualisation/ecs-agent.nix

  ./virtualisation/hyperv-guest.nix

  ./virtualisation/incus.nix

  ./virtualisation/kvmgt.nix

  ./virtualisation/libvirtd.nix

  ./virtualisation/lxc.nix

with lib;

let

  layouts = config.services.xserver.extraLayouts;

  layouts = config.services.xserver.xkb.extraLayouts;

  layoutOpts = {

    options = {

  };

  xkb_patched = pkgs.xorg.xkeyboardconfig_custom {

    layouts = config.services.xserver.extraLayouts;

    layouts = config.services.xserver.xkb.extraLayouts;

  };

in

{

  imports = [

    (lib.mkRenamedOptionModuleWith {

      sinceRelease = 2311;

      from = [ "services" "xserver" "extraLayouts" ];

      to = [ "services" "xserver" "xkb" "extraLayouts" ];

    })

  ];

  ###### interface

  options.services.xserver = {

  options.services.xserver.xkb = {

    extraLayouts = mkOption {

      type = types.attrsOf (types.submodule layoutOpts);

      default = { };