Improvements to default.nix file