Bring your own big jug of water with lime/lemon and cucumber to empty/enjoy at work. I can only drink R/O water now; regular tap water tastes horrible to me. I live in the land of water softeners.
I fill a 20 oz bottle with 2/3 r/o water and 1/3 unsweetened kombucha for work. I drink a lot of water at home so that is enough for me during my shift.
I think it is best to just learn to like plain water. No need to force yourself to drink 'insane' amounts, but I think force yourself to drink it plain is wise. Aside from my daily big mug of Crio Bru for breakfast, water is all I drink.
NO SODA. Might as well drink sugar soda if you are going to drink it. Buy Izze or some other fruit juice sweetened stuff if you have to, or drink flavored carbonated water if it is the bubbles that get you. Wean yourself off of it entirely and save some big bucks.