kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Do not force QEMU options onto machines

Browse source
This commit is contained in:
Nicolas Jeannerod 2025-07-01 16:55:43 +02:00
parent a791ad41ec
commit 1c92009879
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
7 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
infra/common/nixos/default.nix
View file

@ -8,7 +8,6 @@ in
_class = "nixos"; _class = "nixos";
imports = [ imports = [
./hardware.nix
./networking.nix ./networking.nix
./users.nix ./users.nix
]; ];

2
infra/common/nixos/hardware.nix → infra/common/proxmox-qemu-vm.nix
View file

@ -15,8 +15,6 @@
availableKernelModules = [ availableKernelModules = [
"ata_piix" "ata_piix"
"uhci_hcd" "uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod" "sd_mod"
"sr_mod" "sr_mod"
]; ];

1
infra/flake-part.nix
View file

@ -40,6 +40,7 @@ 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 = [

6
machines/dev/fedi200/default.nix
View file

@ -16,4 +16,10 @@
gateway = "2a00:51c0:13:1305::1"; gateway = "2a00:51c0:13:1305::1";
}; };
}; };
nixos.module = {
imports = [
../../../infra/common/proxmox-qemu-vm.nix
];
};
} }

1
machines/dev/fedi201/default.nix
View file

@ -19,6 +19,7 @@
nixos.module = { nixos.module = {
imports = [ imports = [
../../../infra/common/proxmox-qemu-vm.nix
./fedipanel.nix ./fedipanel.nix
]; ];
}; };

1
machines/dev/vm02116/default.nix
View file

@ -14,6 +14,7 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [ imports = [
../../../infra/common/proxmox-qemu-vm.nix
./forgejo.nix ./forgejo.nix
]; ];

1
machines/dev/vm02187/default.nix
View file

@ -14,6 +14,7 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [ imports = [
../../../infra/common/proxmox-qemu-vm.nix
./wiki.nix ./wiki.nix
]; ];