Looking for a new setup for both laptop & desktop

Hi all, as title says. I'm checking my options to connect both laptop & desktop. Whether or not I'll need new speakers and/or an AMP.

Current Setup:

• 1 desktop

• 1 laptop from work (closed to the side)

• 2 monitors connected to both devices

• USB switch for the keyboard & mouse

• 15 year old Creative speakers which are starting to fail, specifically the volume button where I currently have a piece of plastic jammed into as a temporary fix

• B&O headset which I rarely use, mostly with my phone. Dont kill me, but I prefer to game with iphone earbuds.

During the day my laptop is on and after hours I use my desktop (gaming & side project).

Problem: I would like to use both devices with the same speakers, so I can easily listen to music from the laptop through speakers.

Is this easily fixable with an AMP?

As for speakers I'm currently hesitating whether or not to buy new ones (soundbar/speakers) or to fix the current ones. I like them aesthetically and they're slim enough to fit the left one between the monitors (see picture).

Thanks for your tips & tricks!

Setup: https://imgur.com/a/xI2hclz Current speakers: https://www.amazon.com/Creative-Labs-I-Trigue-Speaker-System/dp/B0006GYNPQ