forked from fediversity/fediversity
Compare commits
2 commits
baaa990513
...
9b5de67b8e
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b5de67b8e | |||
| d9f2d942b2 |
3 changed files with 13 additions and 6 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 = [
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ in
|
|||
};
|
||||
|
||||
## NOTE: This is a physical machine, so is not covered by disko
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkForce {
|
||||
device = "rpool/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
|
@ -58,7 +58,7 @@ in
|
|||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
fileSystems."/boot" = lib.mkForce {
|
||||
device = "/dev/disk/by-uuid/50B2-DD3F";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue