There have been diesel electric surface ships as well going back to WWII, although it hasn't proven a very popular design and they remain an oddity.