Yes. I took up running. Seems to have fixed it for me.

Also make sure there is clean separation between work and home. Different hardware, different location even if it's the other side of the same room.