diff --git a/nix/hardware/oci-nixos.nix b/nix/hardware/oci-nixos.nix index 7241533..60a3ea9 100644 --- a/nix/hardware/oci-nixos.nix +++ b/nix/hardware/oci-nixos.nix @@ -1,13 +1,14 @@ hostname: -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, modulesPath, ... }@all: with lib; let cfg = config.magic_rb.hardware."${hostname}"; + qemu-guest = import (modulesPath + "/profiles/qemu-guest.nix") all; in { options.magic_rb.hardware."${hostname}" = mkEnableOption ""; - config = mkIf cfg { + config = mkIf cfg ({ boot = { kernelPackages = pkgs.linuxPackages_latest; loader.grub.extraConfig = '' @@ -15,6 +16,10 @@ in terminal_input --append serial terminal_output --append serial ''; + + initrd.kernelModules = [ + "nvme" + ]; }; swapDevices = [ @@ -33,8 +38,8 @@ in "/boot/efi" = { device = "/dev/disk/by-uuid/4478-6009"; - fsType = "ext4"; + fsType = "vfat"; }; }; - }; + } // qemu-guest); } diff --git a/nix/systems/oci-nixos.nix b/nix/systems/oci-nixos.nix index de01ff6..ff58144 100644 --- a/nix/systems/oci-nixos.nix +++ b/nix/systems/oci-nixos.nix @@ -9,8 +9,8 @@ inputs: { magic_rb = { grub = { enable = true; - efi.enable = false; - devices = [ "/dev/disk/by-id/scsi-360646ec4d8e14b45b588dcafaf0b511b" ]; + efi.enable = true; + devices = [ "nodev" ]; }; pins = {