I always thought nerd would be used to talk about someone who is interested with something (for lack of a better term) real, like computers or stuff. A geek would apply to someone who likes things that are more fictional, like Star Wars or Lord of the Rings.