It is just electricity generation, but it is also important to add, that it is the global average price of solar being 29% lower then the global average price of fossil fuel power generation. That means in good locations it would be even cheaper.

As for storage batteries are starting to kill gas power plant projects for cost reasons. That mainly happens in Europe with higher gas costs and emissions pricing, but there are some US examples as well. Both solar and batteries are rapidly becoming cheaper as well.