To me, geek means someone that is obsessed over something non-harmful.

Movies, books, boardgames, video games, cosplay, anime, math, computers, applications, …

A nerd is a geek who made the obsession their job. Like a professional geek.