- adding an iso package to the flake

- floating dtbName up into the flake so it can be referenced
  by the module and the iso
- linting with nixfmt-rfc-style

.gitignore

@@ -1 +1,2 @@
 .secret.envrc
+result

flake.nix

@@ -6,6 +6,9 @@
 
   outputs =
     inputs@{ flake-parts, self, ... }:
+    let
+      dtbName = "sc8280xp-lenovo-thinkpad-x13s.dtb";
+    in
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [ ./packages/part.nix ];
 
@@ -18,11 +21,15 @@
         { pkgs, ... }:
         {
           devShells.default = pkgs.mkShellNoCC { packages = [ pkgs.npins ]; };
+          packages = {
+            iso = self.nixosConfigurations.iso.config.system.build.isoImage;
+          };
         };
 
-      flake.nixosModules.default = import ./module.nix;
+      flake.nixosModules.default = import ./module.nix { inherit dtbName; };
 
-      flake.nixosConfigurations.example = inputs.nixpkgs.lib.nixosSystem {
+      flake.nixosConfigurations = {
+        example = inputs.nixpkgs.lib.nixosSystem {
           system = "aarch64-linux";
           modules = [
             self.nixosModules.default
@@ -43,5 +50,42 @@
             }
           ];
         };
+
+        iso = inputs.nixpkgs.lib.nixosSystem {
+          system = "aarch64-linux";
+          modules = [
+
+            self.nixosModules.default
+            {
+              nixos-x13s = {
+                enable = true;
+                kernel = "mainline";
+              };
+            }
+
+            (
+              { modulesPath, config, ... }:
+              let
+                dtb = "${config.boot.kernelPackages.kernel}/dtbs/qcom/${dtbName}";
+              in
+              {
+                imports = [ "${toString modulesPath}/installer/cd-dvd/iso-image.nix" ];
+                nixpkgs.config.allowUnfree = true;
+                isoImage = {
+                  makeEfiBootable = true;
+                  makeUsbBootable = true;
+
+                  contents = [
+                    {
+                      source = dtb;
+                      target = "/" + dtbName;
+                    }
+                  ];
+                };
+              }
+            )
+          ];
+        };
+      };
     };
 }

module.nix

@@ -1,3 +1,4 @@
+{ dtbName }:
 {
   config,
   lib,
@@ -9,16 +10,12 @@ let
 
   x13sPackages = import ./packages/default.nix { inherit lib pkgs; };
 
-  dtbName = "sc8280xp-lenovo-thinkpad-x13s.dtb";
   linuxPackages_x13s =
     if cfg.kernel == "mainline" then
       pkgs.linuxPackages_latest
     else
       pkgs.linuxPackagesFor (
-        if cfg.kernel == "jhovold" then
+        if cfg.kernel == "jhovold" then x13sPackages.linux_jhovold else throw "Unsupported kernel"
-          x13sPackages.linux_jhovold
-        else
-          throw "Unsupported kernel"
       );
   dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}";
   dtbEfiPath = "dtbs/${cfg.kernel}/${config.boot.kernelPackages.kernel.version}/${dtbName}";