German Keyboard not mapped correctly

[f-fritz]

Hey,

I just installed Asahi Linux on my MacBook Pro with standard German Keyboard Layout and it looks like two Keys are swapped on the standard Layer:
The button left to the "1" Key should be ^ and ° but is < and >
While the button left to the "Y" Key should be < and > but is ^ and °

There are various wrong mappings on the OPT layer as well as the OPT + SHIFT layer

See Screenshots of the macOS Accessibility (onscreen) Keyboard for the desired mapping below:

Neither OPT or SHIFT pressed:

SHIFT pressed:

OPT pressed:

OPT + SHIFT pressed:

All keys which are mapped wrong when using Linux are annotated with a red square.

Let me know, if a notation other than screenshots is desired

[f-fritz]

Maybe this is more helpful for identifying the desired characters?

Explanation

KEY       : This is what's printed on the key(board)
EXPECTED  : This is the character generated while using macOS when pressing the respective key together with OPT or SHIFT + OPT (see group header) 

OPT pressed

KEY       ^ 1 2 3 4 5 6 7 8 9 0 ß ´
EXPECTED  „ ¡ “ ¶ ¢ [ ] | { } ≠ ¿ '

KEY       q w e r t z u i o p ü +
EXPECTED  « ∑ € ® † Ω ¨  ⁄ ø π • ±

KEY       a s d f g h j k l ö ä #
EXPECTED  Å ‚ ∂ ƒ © ª º ∆ @ œ æ ‘

KEY       < y x c v b n m , . -
EXPECTED  ≤ ¥ ≈ ç √ ∫ ~ µ ∞ … –

OPT + SHIFT pressed

KEY       ^ 1 2 3 4 5 6 7 8 9 0 ß ´
EXPECTED  “ ¬ ” # £ fi ^ \ ˜ · ¯ ˙ ˚

KEY       q w e r t z u i o p ü +
EXPECTED  » „ ‰ ¸ ˝ ˇ Á Û Ø ∏ ° 

KEY       a s d f g h j k l ö ä #
EXPECTED  Å Í ™ Ï Ì Ó ı ˆ fl Œ Æ ’

KEY       < y x c v b n m , . -
EXPECTED  ≥ ‡ Ù Ç ◊ ‹ › ˘ ˛ ÷ —

EDIT: updated explanation / legend

[Fl1tzi]

I just created a pr and this should fix the error with the <> and ^° buttons. I think the other errors are because you are using the regular "de" layout. To fix this use the "de(mac)" layout. If you still find keys that are incorrect after this please post it here.

[f-fritz]

In System Settings > Hardware: Input Devices > Keyboard, the Keyboard Model is set to "Apple | MacBook/MacBook Pro" and when I check the "Configure layouts" checkbox on the Layouts Tab, it says Map: de, Layout: German, Variant: German (Macintosh).

I can also switch to "Apple | Apple Aluminium (ISO)" Keyboard Model and apply the change. But whatever I choose: When I type something, the mapping is still wrong as mentioned in the first post. However, OPT + L for "@" does work - so it can't be the standard German layout, can it?

Or is there a special trick or thing to do to apply the Keyboard Model change?
@Fl1tzi does it work on your machine?

[Fl1tzi]

What is your output from cat /etc/X11/xorg.conf.d/00-keyboard.conf

[f-fritz]

What is your output from cat /etc/X11/xorg.conf.d/00-keyboard.conf

xxxxxx@asahi:~ -$ cat /etc/X11/xorg.conf.d/00-keyboard.conf
# Read and parsed by systemd-localed. It's probably wise not to edit this file
# manually too freely.
Section "InputClass"
        Identifier "system-keyboard"
        MatchIsKeyboard "on"
        Option "XkbLayout" "de"
        Option "XkbVariant" "mac"
EndSection

[Fl1tzi]

When you run setxkbmap -layout "de(mac)" is then you're layout right?

[f-fritz]

No. Even logged out and -in again. (But all open windows came back - would changes really be applied then?)

KEY       ^ 1 2 3 4 5 6 7 8 9 0 ß ´
OPT       | ¡ ² ³ ¼ [ ] | { } } \ ¸
EXPECTED  „ ¡ “ ¶ ¢ [ ] | { } ≠ ¿ ' 

[Fl1tzi]

Oh you are right. I did not notice the little commands only the major ones. The same applies for me. sry

[f-fritz]

Ah, too bad - I hoped I just did it the wrong way 😅
No problem! :)

[Fl1tzi]

So there are some new changes to be made. I think the de(mac) layout is probably pretty old now and needs an upgrade.

That seems to be the current one and it probably needs an update:

// Copied from macintosh_vndr/de
// olh@suse.de   very close to MacOS map

partial alphanumeric_keys
xkb_symbols "mac" {

    include "de"
    name[Group1]= "German (Macintosh)";

    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};
    key <AE05>	{ [         5,    percent,  bracketleft       ]	};
    key <AE06>	{ [         6,  ampersand, bracketright       ]	};
    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
    key <AE08>	{ [         8,  parenleft,    braceleft,   asciitilde ]	};
    key <AE09>	{ [         9, parenright,   braceright       ]	};
    key <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};
    key <AD04>	{ [         r,          R,   registered       ]	};
    key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
    key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	};
    key <AC01>	{ [         a,          A,        aring,        Aring ]	};
    key <AC05>	{ [         g,          G,    copyright       ]	};
    key <AC06>	{ [         h,          H,  ordfeminine       ]	};
    key <AC09>	{ [         l,          L,           at       ]	};
    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};
    key <AB06>	{ [         n,          N,   asciitilde       ]	};
};```

[Fl1tzi]

I guess I have something to do now.

[Fl1tzi]

I would work after your expectation that you posted if they are correct. Can you confirm that they are like this in macOS?

[Fl1tzi]

Okay I think I managed to configure it right. The left option key seems to not work properly but the right one does. Could you test it out? To do so replace this file with the /usr/share/X11/xkb/symbols/de file. Use at your own risk. Just run setxkbmap -layout "de(mac)" to select it at runtime.