More or less. The sub stories of Yen and Ciri aren't in the books which forces the showrunner to cut a lot of stuff from Geralt's stories. Most episodes are based on short stories found in The Last Wish and Sword of Destiny; the two books leading into "The Witcher Saga"

Stories from The Last Wish:
The Lesser Evil
The Witcher
A Question of Price
The Edge of the World
The Last Wish

Stories from Sword of Destiny:
The Bounds of Reason

The battle in episode 8 is told later on either in the saga or season of storms, can't remember which.

Also for those wondering, Geralt's last wish was for him to die when Yen dies. As the Djinn can't kill it's master, it was forced to flee as it couldn't be directly responsible for Geralt's death.

---
Tho I walk through the valley of the shadow of death, I shall fear no evil. For I'm the meanest mofo in the whole f'n valley

Will the Witcher tv show catch me up on the story before playing Witcher 3?

[none]

[none]

---