Linux pc. Still have Windows as a dual boot if I need it.
I like how mac notebooks look, I wouldn't mind having that if it's in addition to a desktop.
But for the next time I upgrade I'm thinking of ditching the desktop and getting a notebook and a storage/media center server (so I'll likely get a regular notebook).