A geek is technically adept and uber-cool, whereas a nerd is just... not.
They are both technically adept but the geek functions well in society whereas the nerd is socially awkward. Neither one is cool.
The geek is a techhie but the nerd is obsessed with Star Trek or Dr. Who.
The nerd is the cool one.