Pretty much same as you, although sadly a lot more of my fluid intake is in the form of coke zero which I'm trying to break. I only keep bottled water around in case of emergency. I've found that after I bought a large Nalgene bottle I drink a lot more water.