Simplify the nix expression structure for base.nix and dev2.[67].nix