forked from Fediversity/Fediversity
resolve regressions from recent qemu files
- move import to match module classes - manually import sources to resolve infinite recursion
This commit is contained in:
parent
baaa990513
commit
d9f2d942b2
2 changed files with 11 additions and 4 deletions
|
@ -1,9 +1,13 @@
|
|||
{ modulesPath, ... }:
|
||||
|
||||
let
|
||||
# pulling this in manually over from module args resolves an infinite recursion
|
||||
sources = import ../../npins;
|
||||
in
|
||||
{
|
||||
_class = "nixos";
|
||||
|
||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||
imports = [
|
||||
"${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
|
|
|
@ -33,6 +33,10 @@ let
|
|||
;
|
||||
};
|
||||
|
||||
nixos.module.imports = [
|
||||
./common/proxmox-qemu-vm.nix
|
||||
];
|
||||
|
||||
imports =
|
||||
[
|
||||
./common/resource.nix
|
||||
|
@ -40,7 +44,6 @@ let
|
|||
++ (
|
||||
if isTestVm then
|
||||
[
|
||||
./common/proxmox-qemu-vm.nix
|
||||
../machines/operator/${vmName}
|
||||
{
|
||||
nixos.module.users.users.root.openssh.authorizedKeys.keys = [
|
||||
|
|
Loading…
Add table
Reference in a new issue