I do what Angelique does - refill bottled water bottles and put them in the fridge. I have a well and the water is supposedly "awesome spring water" - but I just can't drink tap water, and it comes out of the faucet as cold as it feels from the fridge.
OTOH - NYC does have good tap water though, and I'll drink that on rare occasions.
Anything with artificial sweetener is a guaranteed migraine trigger for me. I won't even chew sugarless gum.
I drink vitamin water a lot and Iced Tea. I personally don't care if "water" is the best source of hydration or if it's better for me **immature child tantrum-ish look**

There is water in everything I eat, there is water in my fruit and raw veggies, so that counts, and - there is water in my iced tea and bottles of vitamin water

Oh yeah, and in the ??? XXXX cups of coffee I drink
Oh, and yeah - tubes of sugar!? That sounds intriguing. Where would I find a tube of sugar? I'm so there!