I don't carry locks because when I've commuted, at least in the last 8-9 years, I haven't had to lock-up (taken bike to or near desk). Anyhow, I have two bikes, a road bike and a folder. Each has its own under-saddle bag with its own set of tubes, patches, CO2, multitool, etc. The bag for the folder is bigger than the one for the road bike because it needs to fit a 15mm wrench for the back wheel (clickbox hub gears there so no quick-release skewer). I only recently got a second multitool and it has more features (specifically a chain tool) than my first so I may switch it back and forth or get a second copy of the new one.

I have, IIRC, at least three road pumps, one a frame pump for the road bike, one minipump with a gauge, and the third is a combo pump/CO2 inflator. The first is Presta-only and of course is only suitable for the road bike because of the size (at least without a backpack involved with the folder). The second has dual heads for either valve type. Lately I've taken to moving the third, which has a single smart head for both valve types, back and forth from one bike to the other but I have options, as you can see. There may even be an old MTB frame-like pump somewhere but I haven't seen it in a while. Anyhow, both bikes have Presta valves so I suppose any pump would work for any bike in my case.