In terms of global primary energy consumption, there is no shift. The fraction of fossils in total is effectively constant.

I make about two thirds of my net electricity demand by DIY rooftop solar. Might look into few kWh battery buffering and zero feed in this year or next.