X1 Carbon with Wayland

Here, I described how I set up my Lenovo Thinkpad X1 Carbon. Unfortunately, Wayland breakes my Keyboard Configuration as xmodmap is deprecated. Following a post on Stackexchange, I managed to get my keyboard work propperly again. However the solution provided there did not work for me, so I changed the Neo keymap definitions directly.

I changed the behaviour in the way that Pos1 and End behave as Caps Lock again by updating the caps_switch definition within /usr/share/X11/xkb/symbols/level3:

// The CapsLock key (while pressed) chooses the third shift level.
partial modifier_keys
xkb_symbols "caps_switch" {
 key <CAPS> {
 type[Group1]="ONE_LEVEL",
 symbols[Group1] = [ ISO_Level3_Shift ]
 };
 key <END> {
 type[Group1]="ONE_LEVEL",
 symbols[GROUP1] = [ ISO_Level3_Shift ]
 };
 key <HOME> {
 type[Group1]="ONE_LEVEL",
 symbols[GROUP1] = [ ISO_Level3_Shift ]
 };
 include "level3(modifier_mapping)"
};

Download the full map file here: level3 (Remove the .txt suffix to use the file).