diff options
| author | Victor Engmark <victor@engmark.name> | 2023-10-09 14:31:13 +1300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-10-11 09:46:37 +0300 |
| commit | 3a6c79cff6aa6f4c29af04b544ab367561f11346 (patch) | |
| tree | 80b7f0996e0b7feb42d177da6fefa80a9689be58 /nixos/modules/config | |
| parent | b3597a7a434435c33d0fb7cd5b15fdf94b465ba8 (diff) | |
| download | nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.tar nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.tar.gz nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.tar.bz2 nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.tar.lz nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.tar.xz nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.tar.zst nixpkgs-3a6c79cff6aa6f4c29af04b544ab367561f11346.zip | |
nixos/x11: refactor XKB options into a single attrset
[Motivation](https://github.com/NixOS/nixpkgs/issues/257817#issuecomment-1741705042):
- Having all the XKB options in the same attribute set clarifies their
relation better than using a common option name prefix ("xkb").
- `services.xserver.layout` is an XKB option, but this is not obvious
from its name. Putting it with the other XKB options clarifies this.
Co-authored-by: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/console.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index d06ec0051c4..0a931c6918f 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -127,8 +127,8 @@ in ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}" } \ - -model '${xkbModel}' -layout '${layout}' \ - -option '${xkbOptions}' -variant '${xkbVariant}' > "$out" + -model '${xkb.model}' -layout '${xkb.layout}' \ + -option '${xkb.options}' -variant '${xkb.variant}' > "$out" ''); } |