You're right. For some reason I got "passwords" stuck in my head.KeePass is a great password manager (I use it myself) but I do not believe that it can do whole-disk encryption.
There's advice on open source, cross platform encryption here...Thank you all, need something that is usable on both mac and well as windows.