Longer form post why I'm considering new hardware. Hopefully you can help...?
@kev Based on your use/needs, I'd upgrade both systems. Grab a decent/lower power laptop like a Pinebook. Since you're not gaming, you can forgo the cost of an expensive GPU, and focus on more of a "workstation" setup. You can get some amazing deals on older dual Intel Xeon motherboards and CPUs that would last you a long time. Maybe a Supermicro board, dual x5675 processors (which would yield 12 cores/24 threads) and a mountain of DDR3 ECC ram.
@kev It would eat all the coding you could throw at it. Not to mention, you'd have plenty of resources to spin up virtual machines for different distros and other operating systems. Board would like run you $80-$120. CPUs would be $25/each. Ram is about $10 for an 8gb stick and you could load it with a few hundred gb. (Edit: I should have clarified that the dual Xeons setup would be for the desktop)
Fosstodon is an English speaking Mastodon instance that is open to anyone who is interested in technology; particularly free & open source software.