Clarification on the lore of the new expansion

Howdy!! I’m just dropping by to attempt to catch up on the new lore introduced in rise of the machine, if there is new lore. I have not played the new expansion yet, but I am re-downloading Quake 1 to play it.

From what I understand so far, it bridges the gap between quake 1 and 2, with the final defeat of The Quake Entity / Shub Nigarath, and officially showing The Strogg to be part of its army. I heard there are npc allies in this expansion, which was a surprise because i believed the ranger was the last soldier uncorrupted by Quake, but an all out war against Quake sounds exciting.

On a side note, The Cosmic Relm from Doom The Dark Ages really reminds me of The Quake Dimension. I would like to say they are one and the same, but I hear that was confirmed false?

I don’t mind story spoilers, I’m not sure I’ll actually finish the expansion lol.