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/services/x11/display-managers | |
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/services/x11/display-managers')
-rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 25470e2d3c2..6ca7a4425f8 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -204,10 +204,10 @@ in left-handed = xcfg.libinput.mouse.leftHanded; }; keyboard = { - keymap_model = xcfg.xkbModel; - keymap_layout = xcfg.layout; - keymap_variant = xcfg.xkbVariant; - keymap_options = xcfg.xkbOptions; + keymap_model = xcfg.xkb.model; + keymap_layout = xcfg.xkb.layout; + keymap_variant = xcfg.xkb.variant; + keymap_options = xcfg.xkb.options; }; }; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}"; description = lib.mdDoc "Command used to start the selected compositor"; |