I honestly can't think of the last time I've seen a gas station that only sells gas or diesel. At least around here, they just don't exist. The "gas station" is the convenience store around here. I doubt their patronage would drop off much if they stopped selling gas.

Gas stations around here sell anything from the usual cigaretter, pop & snacks to really good "home made" food. I can think of one that had a small, very good, Mexican restaurant in the back and another that made gyros, falafel, etc. to order. I would go out of my way to stop at those.

But gas only? I simply can't remember seeing one in the last 10 years. The closest is the ones that are service stations that happen to have a few gas pumps.

"Mostly" gas only pumps started reappearing in the last 10 years as a part of big supermarket chains. From one point of view they are mostly just gas pump islands floating in a sea of parking, but from the other point of view the nearby supermarket is simply an absurdly large convenience store.

The ones around here that aren't part of a convenience store are part of a car repair place.

Also we'll see many service businesses (e.g. restaurants, theaters, public garages, malls) offering electric car charging for free or for a smallish fee depending on their type. So, instead of going to a gas station, you would go to a nearest mall, let the car charging while you do the shopping.

I think we will see some development of quick charge technology this will mitigate those concerns to a certain extent.