Diesel will slowly go away because of the ever tightening emissions noose. It's just getting harder and harder to have something that's both compliant and has a lifetime TCO that's lower than equivalent gasoline engines that can more easily meet their (more stringent) emissions requirements.

The bar for what kind of usage makes diesel cheaper than gas over all is constantly creeping higher. Notice how a huge fraction of smaller medium duty trucks have gasoline engines these days.