The appelation "geek" has been both a perjorative term and one of endearment or honor, depending on both to whom and from whom it is directed.
I was called a "nerd" early on prior to the advent of the common use of "geek". This is primarily by those with whom I have worked.
Those in my social arena pretty much thought I was "stupid" because they neither comprehended nor cared about my particular set of skills — which didn't become mainstream until well after my desire for any semblance of popularity ended ...
Be all of this as it may I have never really objected to either term and personally, I equate the term "nerd" with "geek" because I don't believe there is any fine distinction between the two.
A geek is a person who both knows about and displays high level interest in one or more subject areas — which is likely something technical or niche.
However, that act of engaging and discussing technical information at length and with great attention to detail also marks me as what I am.
Suffice it to say I am satisfied to sit before a person's keyboard and remove all doubt about just who knows what in the realm of technology.