I am definitely not the "self-discipline" type, but years ago I made myself a couple of habits that only take minutes to do and made me feel better:
"never wake up to a dirty apartment and never come home to an unmade bed"
(dirty = bottles/stinky ashtrays/dishes in sink - rest doesn't count)