Subjectively: when I think "geek" I think of someone who isn't afraid so express esoteric interests in social situations (dressing as a Klingon in public, say); "nerd" for me connotes someone more of the pocket pen protector ilk.