From 3a6c79cff6aa6f4c29af04b544ab367561f11346 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 9 Oct 2023 14:31:13 +1300 Subject: 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 --- nixos/modules/installer/tools/tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/modules/installer/tools') diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 78bcbbe2db5..d385e4a6b1c 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -163,15 +163,15 @@ in # console = { # font = "Lat2-Terminus16"; # keyMap = "us"; - # useXkbConfig = true; # use xkbOptions in tty. + # useXkbConfig = true; # use xkb.options in tty. # }; $xserverConfig $desktopConfiguration # Configure keymap in X11 - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e,caps:escape"; + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; # Enable CUPS to print documents. # services.printing.enable = true; -- cgit 1.4.1