Squash merge testing into main

This commit is contained in:
Don Harper 2026-01-06 23:27:49 -06:00
parent fa956f5da2
commit 30bb818058
18 changed files with 289 additions and 97 deletions

View file

@ -61,5 +61,5 @@
]
++ (args.extraPublicKeys or []); # this is used for unit-testing this module and can be removed if not needed
system.stateVersion = "25.11";
stdenv.hostPlatform.system.stateVersion = "25.11";
}

View file

@ -13,7 +13,7 @@
}:
{
nixosConfigurations.hetzner-cloud = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
stdenv.hostPlatform.system = "x86_64-linux";
modules = [
disko.nixosModules.disko
./configuration.nix
@ -21,7 +21,7 @@
};
# tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec
nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
stdenv.hostPlatform.system = "x86_64-linux";
modules = [
./digitalocean.nix
disko.nixosModules.disko
@ -30,7 +30,7 @@
];
};
nixosConfigurations.hetzner-cloud-aarch64 = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
stdenv.hostPlatform.system = "aarch64-linux";
modules = [
disko.nixosModules.disko
./configuration.nix
@ -40,7 +40,7 @@
# Use this for all other targets
# nixos-anywhere --flake .#generic --generate-hardware-config nixos-generate-config ./hardware-configuration.nix <hostname>
nixosConfigurations.generic = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
stdenv.hostPlatform.system = "x86_64-linux";
modules = [
disko.nixosModules.disko
./configuration.nix
@ -51,7 +51,7 @@
# Slightly experimental: Like generic, but with nixos-facter (https://github.com/numtide/nixos-facter)
# nixos-anywhere --flake .#generic-nixos-facter --generate-hardware-config nixos-facter facter.json <hostname>
nixosConfigurations.generic-nixos-facter = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
stdenv.hostPlatform.system = "x86_64-linux";
modules = [
disko.nixosModules.disko
./configuration.nix