I needed to setup a separate office for work stuff and work stuff only before I really got into a WFH rhythm. Definitely have experiences that match yours in office environment.
Same. I had to physically separate myself from my personal computer because I frequently found myself working on side projects, playing video games, or literally anything else that grabbed my attention.