diff --git a/flake.nix b/flake.nix index 1d0b03f..dac7397 100644 --- a/flake.nix +++ b/flake.nix @@ -22,26 +22,40 @@ flake.nixosModules.default = import ./module.nix; - flake.nixosConfigurations.example = inputs.nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - modules = [ - self.nixosModules.default - { - nixos-x13s.enable = true; - nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported + flake.nixosConfigurations = { + example = inputs.nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + self.nixosModules.default + { + nixos-x13s.enable = true; + nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported - # install multiple kernels! note this increases eval time for each specialization - specialisation = { - mainline.configuration.nixos-x13s.kernel = "mainline"; - }; + # install multiple kernels! note this increases eval time for each specialization + specialisation = { + mainline.configuration.nixos-x13s.kernel = "mainline"; + }; - # allow unfree firmware - nixpkgs.config.allowUnfree = true; + # allow unfree firmware + nixpkgs.config.allowUnfree = true; - # define your fileSystems - fileSystems."/".device = "/dev/notreal"; - } - ]; + # define your fileSystems + fileSystems."/".device = "/dev/notreal"; + } + ]; + }; + + iso = inputs.nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + self.nixosModules.default + "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + { + nixos-x13s.enable = true; + nixpkgs.config.allowUnfree = true; + } + ]; + }; }; }; } diff --git a/module.nix b/module.nix index 1ec2f47..ee95147 100644 --- a/module.nix +++ b/module.nix @@ -15,10 +15,7 @@ let pkgs.linuxPackages_latest else pkgs.linuxPackagesFor ( - if cfg.kernel == "jhovold" then - x13sPackages.linux_jhovold - else - throw "Unsupported kernel" + if cfg.kernel == "jhovold" then x13sPackages.linux_jhovold else throw "Unsupported kernel" ); dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}"; dtbEfiPath = "dtbs/${cfg.kernel}/${config.boot.kernelPackages.kernel.version}/${dtbName}"; @@ -107,6 +104,17 @@ in }; }; + isoImage = { + makeUsbBootable = lib.mkForce false; + squashfsCompression = "zstd -Xcompression-level 6"; + contents = [ + { + source = dtb; + target = "/" + dtbName; + } + ]; + }; + nixpkgs.overlays = [ (_: super: { # don't try and use zfs