(thrunite TN12/olight s20), (thrunite T10, olight S15), the i3s, black diamond revolt(or storm, if you do not want usb recharging), a handful of lithium AA/AAA, some 123s, a few 3400 panasonics, some sanyo 14500s, a xtar MC1/Miller ML-102, <12in micro usb cable (for the revolt and the charger), a bullet car charger (see pic, can usually accept 12-24v DC), and a amazon kindle charger (see pic, selected for is tiny size, can take 100-240v AC)
you can also get one of those solar panels. If you do, I recommend you build you own power converter, it is sometimes more efficient, and you can pick how fancy or simple it should be.
edit: or you can use a 12/24v solar panel, and a car plug, and use the car adaptor to change the voltage.
edit edit: see MPPT wiki if you are going to go solar.
If you do it right, all your lighting gear/ related parts should fit in a ziplock bag.