Just to counter your nitpick with another nitpick, geothermal is also not solar with extra steps :-)

Edit: tidal power would also seem to fall into that bucket because it comes from the gravitational forces of the solar system.