Comment 33 for bug 255008

setxkbmap -print:
xkb_keymap {
 xkb_keycodes { include "xfree86+aliases(qwerty)" };
 xkb_types { include "complete" };
 xkb_compat { include "complete" };
 xkb_symbols { include "pc+gb(dvorak)+inet(precision_m)" };
 xkb_geometry { include "pc(pc104)" };
};

xorg.conf:
Section "InputDevice"
        Identifier "Generic Keyboard"
        Driver "kbd"
        Option "CoreKeyboard"
        Option "XkbRules" "xorg"
        Option "XkbModel" "pc105"
        Option "XkbLayout" "gb"
        Option "XkbVariant" "dvorak"
EndSection

Using setxkbmap -model evdev -layout gb -variant dvorak fixes it. But how do I make this stick?