diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2023-11-03 13:49:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 13:49:14 +0100 |
| commit | 5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1 (patch) | |
| tree | b99aee09ed52c470c6fb2084c4d13676a6e6dd6a /nixos/doc | |
| parent | 1b56805d9ef340854a73b6c69ea34582ea8331e1 (diff) | |
| parent | 7d7744f15f8f5eef18abced9551754f2f70436e4 (diff) | |
| download | nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.tar nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.tar.gz nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.tar.bz2 nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.tar.lz nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.tar.xz nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.tar.zst nixpkgs-5654dea8a5b5a9769916fbfc75f5449ad8f8d9c1.zip | |
Merge pull request #264787 from katexochen/feat/xkb-extralayouts
nixos/x11: move extraLayouts into xkb attrset
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration/x-windows.chapter.md | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index 5a870a46cbb..0451e4d2526 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -208,7 +208,7 @@ qt.style = "gtk2"; 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 @@ -235,7 +235,7 @@ xkb_symbols "us-greek" 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; @@ -298,7 +298,7 @@ xkb_symbols "media" 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; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 564bf0f33a5..c5406e183c3 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -322,7 +322,7 @@ 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. |