I rediscovered(after 10 years or so) a half-solution the other day: any activity that requires focus but is done offline(so not programming nowadays, unless you have your docs/tutorials/etc offline).
In my case it's making music. The product is obviously crap and takes a lot of time to create, but it has done wonders to my ability to focus.
In my case it's making music. The product is obviously crap and takes a lot of time to create, but it has done wonders to my ability to focus.