I actually used `
# Xorg :1 -configure` to generate a config file. Strangely enough it did generate a config file with the intel driver not the the modesetting driver. Then I just copied this file into
/etc/X11/xorg.conf
It's using the old(?) config style where all options are in a single file, so perhaps it's not very future-proof and it might break with another update. For a reference, here is the
generated file.