convert bootstrap iso to a nixos-generator format

divnix · Jul 10, 2022 · 30ffa0b · 30ffa0b
1 parent 2248d3c
commit 30ffa0b
Showing 1 changed file with 47 additions and 57 deletions.
diff --git a/modules/bootstrap-iso.nix b/modules/bootstrap-iso.nix
@@ -1,3 +1,4 @@
+{ config, lib, modulesPath, self, ... }:
 let
   getFqdn = config:
     let
@@ -7,68 +8,57 @@ let
         then "${net.hostName}.${net.domain}"
         else net.hostName;
     in
-    fqdn;
-
-  protoModule = fullHostConfig: { config, lib, modulesPath, suites, self, inputs, ... }@args: {
+      fqdn;
+in
+  {
 
-    imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
+  imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
 
-    isoImage.isoBaseName = "bootstrap-" + (getFqdn config);
-    isoImage.contents = [{
-      source = self;
-      target = "/devos/";
-    }];
-    isoImage.storeContents = [
-      self.devShell.${config.nixpkgs.system}
-      # include also closures that are "switched off" by the
-      # above profile filter on the local config attribute
-      fullHostConfig.system.build.toplevel
-    ] ++ builtins.attrValues inputs;
-    # still pull in tools of deactivated profiles
-    environment.systemPackages = fullHostConfig.environment.systemPackages;
+  isoImage.isoBaseName = "bootstrap-" + (getFqdn config);
+  isoImage.contents = [{
+    source = self;
+    target = "/etc/nixos/";
+  }];
+  isoImage.storeContents = [
+    self.devShell.${config.nixpkgs.system}
+    # include also closures that are "switched off" by the
+    # above profile filter on the local config attribute
+    config.system.build.toplevel
+  ] ++ builtins.attrValues self.inputs;
+  # still pull in tools of deactivated profiles
 
-    # confilcts with networking.wireless which might be slightly
-    # more useful on a stick
-    networking.networkmanager.enable = lib.mkForce false;
-    # confilcts with networking.wireless
-    networking.wireless.iwd.enable = lib.mkForce false;
+  # confilcts with networking.wireless which might be slightly
+  # more useful on a stick
+  networking.networkmanager.enable = lib.mkForce false;
+  # confilcts with networking.wireless
+  networking.wireless.iwd.enable = lib.mkForce false;
 
-    # Set up a link-local boostrap network
-    # See also: https://github.com/NixOS/nixpkgs/issues/75515#issuecomment-571661659
-    networking.usePredictableInterfaceNames = lib.mkForce true; # so prefix matching works
-    networking.useNetworkd = lib.mkForce true;
-    networking.useDHCP = lib.mkForce false;
-    networking.dhcpcd.enable = lib.mkForce false;
-    systemd.network = {
-      # https://www.freedesktop.org/software/systemd/man/systemd.network.html
-      networks."boostrap-link-local" = {
-        matchConfig = {
-          Name = "en* wl* ww*";
-        };
-        networkConfig = {
-          Description = "Link-local host bootstrap network";
-          MulticastDNS = true;
-          LinkLocalAddressing = "ipv6";
-          DHCP = "yes";
-        };
-        address = [
-          # fall back well-known link-local for situations where MulticastDNS is not available
-          "fe80::47" # 47: n=14 i=9 x=24; n+i+x
-        ];
-        extraConfig = ''
-          # Unique, yet stable. Based off the MAC address.
-          IPv6LinkLocalAddressGenerationMode = "eui64"
-        '';
+  # Set up a link-local boostrap network
+  # See also: https://github.com/NixOS/nixpkgs/issues/75515#issuecomment-571661659
+  networking.usePredictableInterfaceNames = lib.mkForce true; # so prefix matching works
+  networking.useNetworkd = lib.mkForce true;
+  networking.useDHCP = lib.mkForce false;
+  networking.dhcpcd.enable = lib.mkForce false;
+  systemd.network = {
+    # https://www.freedesktop.org/software/systemd/man/systemd.network.html
+    networks."boostrap-link-local" = {
+      matchConfig = {
+        Name = "en* wl* ww*";
+      };
+      networkConfig = {
+        Description = "Link-local host bootstrap network";
+        MulticastDNS = true;
+        LinkLocalAddressing = "ipv6";
+        DHCP = "yes";
       };
+      address = [
+        # fall back well-known link-local for situations where MulticastDNS is not available
+        "fe80::47" # 47: n=14 i=9 x=24; n+i+x
+      ];
+      extraConfig = ''
+        # Unique, yet stable. Based off the MAC address.
+        IPv6LinkLocalAddressGenerationMode = "eui64"
+      '';
     };
   };
-in
-{ config, ... }:
-{
-  system.build = {
-    bootstrapIso = (config.lib.digga.mkBuild
-      (protoModule config)
-    ).config.system.build.isoImage;
-  };
 }
-