Thanks big time!
sudo apt-get purge nvidia-* seemed to have solved everything for me, though I'm not sure I had the exact same problem.