hosts/{bootstrap,graphical-installer}: refactor for nixos-generators

This commit is contained in:
Gabriel Arazas 2024-02-17 14:58:53 +08:00
parent 8bd3ac5061
commit 03c57d73d3
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
2 changed files with 57 additions and 45 deletions

View File

@ -6,6 +6,20 @@
# #
# This means, there will be a "nixos" user among other things. # This means, there will be a "nixos" user among other things.
{ {
config = lib.mkMerge [
{
boot.kernelPackages = pkgs.linuxPackages_6_6;
# Assume that this will be used for remote installations.
services.openssh = {
enable = true;
allowSFTP = true;
};
system.stateVersion = "23.11";
}
(lib.mkIf config.formatAttr == "install-iso" {
isoImage = { isoImage = {
isoBaseName = config.networking.hostName; isoBaseName = config.networking.hostName;
@ -17,14 +31,6 @@
squashfsCompression = "zstd -Xcompression-level 11"; squashfsCompression = "zstd -Xcompression-level 11";
}; };
})
boot.kernelPackages = pkgs.linuxPackages_6_6; ];
# Assume that this will be used for remote installations.
services.openssh = {
enable = true;
allowSFTP = true;
};
system.stateVersion = "23.11";
} }

View File

@ -8,18 +8,8 @@
"${modulesPath}/installer/cd-dvd/installation-cd-graphical-base.nix" "${modulesPath}/installer/cd-dvd/installation-cd-graphical-base.nix"
]; ];
isoImage = { config = lib.mkMerge [
isoBaseName = config.networking.hostName; {
# Put the source code somewhere easy to see.
contents = [{
source = ../../..;
target = "/etc/nixos";
}];
squashfsCompression = "zstd -Xcompression-level 12";
};
boot.kernelPackages = pkgs.linuxPackages_6_6; boot.kernelPackages = pkgs.linuxPackages_6_6;
# Use my desktop environment configuration without the apps just to make the # Use my desktop environment configuration without the apps just to make the
@ -44,4 +34,20 @@
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
}
(lib.mkIf (config.formatAttr == "install-iso") {
isoImage = {
isoBaseName = config.networking.hostName;
# Put the source code somewhere easy to see.
contents = [{
source = ../../..;
target = "/etc/nixos";
}];
squashfsCompression = "zstd -Xcompression-level 12";
};
})
];
} }