Move more stuff into home manager as appropriate. Use 'personal' instead of 'home' for non-work stuff.