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,25 +6,31 @@
#
# This means, there will be a "nixos" user among other things.
{
isoImage = {
isoBaseName = config.networking.hostName;
config = lib.mkMerge [
{
boot.kernelPackages = pkgs.linuxPackages_6_6;
# Store the source code in a easy-to-locate path.
contents = [{
source = ../../..;
target = "/etc/nixos/";
}];
# Assume that this will be used for remote installations.
services.openssh = {
enable = true;
allowSFTP = true;
};
squashfsCompression = "zstd -Xcompression-level 11";
};
system.stateVersion = "23.11";
}
boot.kernelPackages = pkgs.linuxPackages_6_6;
(lib.mkIf config.formatAttr == "install-iso" {
isoImage = {
isoBaseName = config.networking.hostName;
# Assume that this will be used for remote installations.
services.openssh = {
enable = true;
allowSFTP = true;
};
# Store the source code in a easy-to-locate path.
contents = [{
source = ../../..;
target = "/etc/nixos/";
}];
system.stateVersion = "23.11";
squashfsCompression = "zstd -Xcompression-level 11";
};
})
];
}

View File

@ -8,40 +8,46 @@
"${modulesPath}/installer/cd-dvd/installation-cd-graphical-base.nix"
];
isoImage = {
isoBaseName = config.networking.hostName;
config = lib.mkMerge [
{
boot.kernelPackages = pkgs.linuxPackages_6_6;
# Put the source code somewhere easy to see.
contents = [{
source = ../../..;
target = "/etc/nixos";
}];
# Use my desktop environment configuration without the apps just to make the
# closure size smaller.
workflows.workflows.a-happy-gnome = {
enable = true;
extraApps = [ ];
};
squashfsCompression = "zstd -Xcompression-level 12";
};
# Some niceties.
suites.desktop.enable = true;
boot.kernelPackages = pkgs.linuxPackages_6_6;
services.xserver.displayManager = {
gdm = {
enable = true;
autoSuspend = false;
};
autoLogin = {
enable = true;
user = "nixos";
};
};
# Use my desktop environment configuration without the apps just to make the
# closure size smaller.
workflows.workflows.a-happy-gnome = {
enable = true;
extraApps = [ ];
};
system.stateVersion = "23.11";
}
# Some niceties.
suites.desktop.enable = true;
(lib.mkIf (config.formatAttr == "install-iso") {
isoImage = {
isoBaseName = config.networking.hostName;
services.xserver.displayManager = {
gdm = {
enable = true;
autoSuspend = false;
};
autoLogin = {
enable = true;
user = "nixos";
};
};
# Put the source code somewhere easy to see.
contents = [{
source = ../../..;
target = "/etc/nixos";
}];
system.stateVersion = "23.11";
squashfsCompression = "zstd -Xcompression-level 12";
};
})
];
}