They're definitely making more than one step in the right direction.
I thought iDevices meant only iPads, iPhones and iPod Touch(es?).
OS X is also a sickly sweet gateway drug to living their iDevice lockdown lifestyle. They are continually doing things to lock down OS X with secret APIs that only Apple can use and that 95% you're talking about will one day figure out who Apple really is. I hope you enjoy being their sales-person until then!
However, I think they've done good for the *nix community. At it's simplest, the switch for a dev to go from mac to linux isn't as drastic as from windows to mac; much of that command line experience transfers over.
I think people will move away. I've already moved most of my dependencies to linux, and I've been a lifelong apple guy.
Why, just today i was trying to open up one of their keyboards and had to hunt around for a screwdriver that'll work, because they use security screws. Pretty much everything they do is anti-tinker and that's measurably holding back members of society from advancing our species; they seek to prevent the very same kind of conditions that permitted them to start apple in the first place; a pretty baffling behavior, least of all anti-social.
I have totally fallen out of love with apple nice to look at shit to use for profesionals.