Both.
Mini-pump for the usual everyday puncture repairs, CO2 for the "It's getting dark and I've no lights" and "It's midnight, we've had five punctures on this night ride, I'm fekin freezin, can we go home now" moments.
I don't like the cost and the waste of a CO2 cannister, but they are useful sometimes.