Compare commits

...

2 commits

Author SHA1 Message Date
9b5de67b8e
ensure bare-metal fileSystems override default, resolves definition conflict on nixops4 apply forgejo-ci 2025-07-05 21:29:23 +02:00
d9f2d942b2
resolve regressions from recent qemu files
- move import to match module classes
- manually import sources to resolve infinite recursion
2025-07-05 21:29:23 +02:00
3 changed files with 13 additions and 6 deletions

View file

@ -1,9 +1,13 @@
{ modulesPath, ... }: let
# pulling this in manually over from module args resolves an infinite recursion
sources = import ../../npins;
in
{ {
_class = "nixos"; _class = "nixos";
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; imports = [
"${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
];
boot = { boot = {
initrd = { initrd = {

View file

@ -33,6 +33,10 @@ let
; ;
}; };
nixos.module.imports = [
./common/proxmox-qemu-vm.nix
];
imports = imports =
[ [
./common/resource.nix ./common/resource.nix
@ -40,7 +44,6 @@ let
++ ( ++ (
if isTestVm then if isTestVm then
[ [
./common/proxmox-qemu-vm.nix
../machines/operator/${vmName} ../machines/operator/${vmName}
{ {
nixos.module.users.users.root.openssh.authorizedKeys.keys = [ nixos.module.users.users.root.openssh.authorizedKeys.keys = [

View file

@ -48,7 +48,7 @@ in
}; };
## NOTE: This is a physical machine, so is not covered by disko ## NOTE: This is a physical machine, so is not covered by disko
fileSystems."/" = { fileSystems."/" = lib.mkForce {
device = "rpool/root"; device = "rpool/root";
fsType = "zfs"; fsType = "zfs";
}; };
@ -58,7 +58,7 @@ in
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = { fileSystems."/boot" = lib.mkForce {
device = "/dev/disk/by-uuid/50B2-DD3F"; device = "/dev/disk/by-uuid/50B2-DD3F";
fsType = "vfat"; fsType = "vfat";
options = [ options = [