colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68310 from rnhmjoj/xkb

Browse Source 
services.xserver.extraLayouts fixes
This commit is contained in:
Linus Heckemann 2019-09-09 10:19:58 +02:00 committed by GitHub
commit c8c04bc96c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/configuration/x-windows.xml
View File

@ -279,6 +279,12 @@ xkb_symbols "media"
<programlisting>
<xref linkend="opt-services.xserver.displayManager.sessionCommands"/> = "setxkbmap -keycodes media";
</programlisting>
<para>
If you are manually starting the X server, you should set the argument
<literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files.
For example with <command>xinit</command> run
<screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
</para>
<para>
To learn how to write layouts take a look at the XKB
<link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts">

5
nixos/modules/services/x11/extra-layouts.nix
View File

@ -158,7 +158,10 @@ in
});
services.xserver.xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
services.xserver = {
xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
exportConfiguration = config.services.xserver.displayManager.startx.enable;
};
};

6
pkgs/servers/x11/xorg/overrides.nix
View File

@ -468,7 +468,7 @@ self: super:
<model>
<configItem>
<name>${name}</name>
<_description>${layout.description}</_description>
<description>${layout.description}</description>
<vendor>${layout.description}</vendor>
</configItem>
</model>
@ -484,8 +484,8 @@ self: super:
<layout>
<configItem>
<name>${name}</name>
<_shortDescription>${name}</_shortDescription>
<_description>${layout.description}</_description>
<shortDescription>${name}</shortDescription>
<description>${layout.description}</description>
<languageList>
${concatMapStrings (lang: "<iso639Id>${lang}</iso639Id>\n") layout.languages}
</languageList>