Is it worthwhile buying a 5.1 speaker system for music listening?

I listen to music essentially nonstop, whether I’m at home or on the go. At home, I have a dinky set of Logitech speakers plugged into my laptop, and the sound out of them is pretty tinny.

I’m looking for some kind of new solution to enjoy my music at home. I’m wondering whether I should look for systems with surround sound, or if normal 2.1 speakers will do just fine.

In addition, I’m wondering whether I should invest in a standalone system, or if I’m fine just plugging the 3.5mm into my laptop. Is there a significant advantage to more complicated systems? What brands should I look for?