I agree with all that you say! Having a jug of water in your workspace and easily reached, ideally very visible, is the best way I find to keep up the intake.
Drinking a couple of glass fulls when you wake up is a good start to the day as well ... but beware the long commute if that is also a part of one's day! Upped!