I can really recommend having an i7/64Gb desktop with native Linux OS as your primary development environment. It is like 20x faster than a Macbook Pro/8Gb with Linux VM.

And you could keep your Macbook Air for looks [and ssh to that box] ;)