Although there is overlap between the two, "tech-savvy" and "geek" are not equivalent.
The definitions you use are a bit heavy on context, they make assumptions and likely associations.
Tech-savvy refers to a technical aptitude, without describing the person's character.
According to the OLD:
Well informed about or proficient in the use of modern technology, especially computers.
A geeky person however, will try to dig as deep as possible to fine-tune the system to work exactly as they want to and will be delighted by the process. They will probably reject an out-of-the box solution because they believe they can set it up better.
I would call that a nerd, not a geek.
The distinction between nerds and geeks is not strictly defined. Those who do are neither a nerd nor a geek tend to use "geek" and "nerd" interchangeably, often using both to mean "socially awkard tech-savvy people".
Following the OLD definitions of nerd and geek, these words can be used interchangeably.
However, if you look at online communities (where everyone is inherenly a computer user), there is a bigger distinction made between nerds and geeks.
- A geek is socially awkward. They behave differently, in a way that creates awkward situations. This can both be conscious (not caring about what others think) and subconscious (trying to be social, but horribly failing at it).
- A nerd overspecializes in their field. They know a lot about their favorite topic, are always interested in learning more, and are prone to making overly pedantic arguments and distinctions.
- Neither "nerd" nor "geek" is inherently referring to technological skills, although it is often implicitly understood to be the case.
Note: Those who do are neither a nerd nor a geek would probably call me a geek for distinguishing between nerds and geeks. But they'd be wrong, distinguishing between nerds and geeks makes me a nerd, not a geek ;)
That doesn't mean that someone can't be both at the same time. If someone is talking in-depth about his favorite topic and not noticing (or caring) that no one is interested in what they are talking about, then they are being a nerd (showing excessively deep knowledge) and a geek (making a social interaction awkward) at the same time.
- The guy who shows up to work dressed as Darth Vader on Star Wars day ("May the fourth" be with you) is a geek.
- The guy who knows the etymological origins of the proverb you just used is a nerd.
- The guy who tells you that Alderaan is actually a dwarf planet when observing its gravity well is a nerd (for knowing this piece of trivia), and could also be considered a geek (e.g. if they are explaining it to someone who clearly doesn't care about Star Wars).
I've also stumbled upon a blog post that describes it better than I'm able to/
- Nerd - intelligent, industrious, understands things
In a general sense, nerds can be from all different backgrounds. But I think that they can generally be described as someone who is willing to study and do the work in order to learn the stuff. I’m not quite sure that someone who is naturally gifted with intelligence but who doesn’t utilize it can be categorized as a nerd. No, I take that back. They cannot be categorized as a nerd. They’re just smart and lazy. Really, how much worse can you get? I think that most people would rather be dumb and hard-working than smart and lazy.
Nerds can often be found in libraries, hunched over books, or wondering aloud about their surroundings. “Nerd” seems to be used most often in a complimentary way when describing others.
- Geek - Interested in things that others are not interested in, know a lot about their interests, but usually do not understand underlying principles
So yes, geeks are the types of people that are not only interested in Star Trek, but who will also dress up to go to the premiere. They’ll also buy collector cards, read forums online, and read every single book about Star Trek. Obsess much? Yes they will. But you don’t know where the Klingon Galaxy is located relative to our current position in space, do you??
Geeks come in all shapes and sizes. Of course, those are usually the odd shapes and sizes. They are generally not as hard to spot as the nerds because of their disregard for what others think of them. Their clothes don’t match, and they might occasionally offend others with their insufficient personal hygiene.