Books mostly, yes. Though I sort of liked the idea of movieverse Merry and Pippin nominating themselves chaperones for the pair, and Aragorn and Eomer looking bewildered (bookverse, too, but in bookverse Pippin's sharing duty with Beregond).

Eowyn and Merry I loved as shieldbrothers and comrades in arms. I didn't really ship them? Could have been because I'd read the books first, though, and was rather attached to Eowyn/Faramir because of it. (That could also be why I didn't like the Eowyn/Aragorn thing from the movies, but I think that was more because ... well, Eowyn didn't need that, why does Eowyn need an unrequited crush on a king, Eowyn was fine being badass without having a love interest for the movie, thank you).