Earlier quoted context omitted.
I don't agree. Many people who use the labels on themselves and their friends have conflicting definitions. Further, I see the distinction as a false one. It boils down to "people within my subgroup that I like" and "people within my subgroup that I don't like."
That's not the distinction at all. The distinction is between antisocial people who like sci-fi and fantasy and smart, somewhat obsessive people who like technology. The groups are not disjoint, but they're by no means the same group.
Geeks people who bite the heads off of chickens and other circus freaks.
Geeks people who are really into some niche such as game geeks, or mathgeeks.
Geeks socially awkward losers.
The definitions of geek and nerd are location and temporally dependent. That means if you grew up in KS during the 80's your definitions are far different than if you grew up in San Jose in the 90's.