Git for hacking projects, DropBox for personal files (which makes for interesting arrangements, since the git repos are in my personal files).