X11 isn't going anywhere because distros will ship XWayland for a long time to ensure compatibility with existing X11-only applicatin.
xorg-server is gone from the linux desktop. Gnome and KDE use wayland shells by default, and that's what users get when they download a Debian/Ubuntu/Fedora/whatever ISO.