factor out nixos conf

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>

infra/makeInstallerIso.nix

@@ -5,9 +5,9 @@
 */
 
 {
-  nixosConfiguration,
+  nixpkgs,
   hostKeys ? { },
-  nixpkgs ? (import ../npins).nixpkgs,
+  nixosConfiguration,
 }:
 
 let
@@ -44,7 +44,7 @@ let
       imports = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" ];
       nixpkgs.hostPlatform = "x86_64-linux";
       services.getty.autologinUser = lib.mkForce "root";
-      programs.bash.loginShellInit = lib.getExe bootstrap;
+      programs.bash.loginShellInit = nixpkgs.lib.getExe bootstrap;
 
       isoImage = {
         compressImage = false;
@@ -55,10 +55,4 @@ let
       };
     };
 in
-(import "${nixpkgs}/nixos/lib/eval-config.nix" {
+(nixpkgs.lib.nixosSystem { modules = [ installer ]; }).config.system.build.isoImage
-  modules = [ installer ];
-  # Allow system to be set modularly in nixpkgs.system.
-  # We set it to null, to remove the "legacy" entrypoint's
-  # non-hermetic default.
-  system = null;
-}).config.system.build.isoImage

infra/proxmox-provision.sh

@@ -223,9 +223,9 @@ build_iso () {
   nix build \
     --impure --expr "
       let flake = builtins.getFlake (builtins.toString ./.); in
-      import ./infra/makeInstallerIso.nix {
+      import ./makeInstallerIso.nix {
         nixosConfiguration = flake.nixosConfigurations.$vm_name;
-        # FIXME pass nixpkgs from npins
+        nixpkgs = flake.inputs.nixpkgs;
         $nix_host_keys
       }
     " \
@@ -239,7 +239,7 @@ Check the Nix logs and fix things. Possibly there just is no NixOS configuration
       "$vm_name"
   fi
 
-  ln -sf "$(ls "$tmpdir/installer-$vm_name"/iso/nixos-*.iso)" "$tmpdir/installer-$vm_name.iso"
+  ln -sf "$tmpdir/installer-$vm_name/iso/installer.iso" "$tmpdir/installer-$vm_name.iso"
 
   printf 'done building ISO for VM %s.\n' "$vm_name"
   release_lock build