Thanks to L3 my sound is working again.!
Some notes to get it working:
Add these 2 lines to /etc/modprobe.d/alsa-base.conf
options snd-hda-intel model=auto
options snd-hda-intel enable_msi=0 index=-2
hash one out and do the following:
reboot, and run sudo aplay -l
Check that your nvidia is at card 0, then test with speakertest
If no sound go back to alsa-base.conf. remove hash from line and hash out the other line.
reboot, and run sudo aplay -l, recheck and speakertest
You should have sound now.
L3, please correct me if I've got it wrong.