Minor improvements and normalization towards Quartiq workflow #6

Open
eduardotenholder wants to merge 17 commits from eduardotenholder/defenestrate:quartiq into master
2 changed files with 26 additions and 15 deletions
Showing only changes of commit be9ab28418 - Show all commits

5
README
View File

@ -1,3 +1,8 @@
On build device:
* nix-build
* (for LAN builds) nix-build --arg mlabs true
On target device:
* Enter BIOS, disable secure boot, enable UEFI PXE network boot * Enter BIOS, disable secure boot, enable UEFI PXE network boot
* sudo auto-install * sudo auto-install
* sudo reboot * sudo reboot

View File

@ -43,20 +43,26 @@ let
nixos-install --no-root-password --flake /mnt/etc/nixos#artiq nixos-install --no-root-password --flake /mnt/etc/nixos#artiq
''; '';
customModule = { customModule = mlabs:
system.stateVersion = "24.05"; let storeUrl = "https://nixbld.m-labs.hk" + (if mlabs then "?priority=10" else "");
environment.systemPackages = [ autoInstall pkgs.git ]; in
documentation.info.enable = false; # https://github.com/NixOS/nixpkgs/issues/124215 {
documentation.man.enable = false; system.stateVersion = "24.05";
nix.settings.trusted-public-keys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; environment.systemPackages = [ autoInstall pkgs.git ];
nix.settings.substituters = ["https://nixbld.m-labs.hk"]; documentation.info.enable = false; # https://github.com/NixOS/nixpkgs/issues/124215
}; documentation.man.enable = false;
nix.settings.trusted-public-keys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];
nix.settings.substituters = [ storeUrl ];
};
in in
makeNetboot { { mlabs ? false }:
modules = [ let module = customModule mlabs;
<nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix> in
customModule makeNetboot {
]; modules = [
system = "x86_64-linux"; <nixpkgs/nixos/modules/installer/netboot/netboot-minimal.nix>
} module
];
system = "x86_64-linux";
}