Self-control is a short-term strategy; disciplined people mostly structure their lives to avoid needing it. Make good cues obvious (put the guitar in the middle of the room) and bad cues invisible (keep junk food out of the house). Environment is often a stronger lever than motivation because you respond to whatever is easiest and most visible.
Related: First impressions can be changed by changing experience