I think geek is the one with more positive connotations. Both mean smart and into one or more subjects intensely, but nerd implies socially awkward and serious and "losery", whereas geek implies a sense of humor, certain fandoms, and a general sense of fun.