Finally fix tweedledum and tweedledee

Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-05-30 12:51:12 +02:00
parent 4be1e7d019
commit badebb495e
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 11 additions and 6 deletions

View file

@ -1,13 +1,14 @@
hostname: hostname:
{ config, pkgs, lib, ... }: { config, pkgs, lib, modulesPath, ... }@all:
with lib; with lib;
let let
cfg = config.magic_rb.hardware."${hostname}"; cfg = config.magic_rb.hardware."${hostname}";
qemu-guest = import (modulesPath + "/profiles/qemu-guest.nix") all;
in in
{ {
options.magic_rb.hardware."${hostname}" = mkEnableOption ""; options.magic_rb.hardware."${hostname}" = mkEnableOption "";
config = mkIf cfg { config = mkIf cfg ({
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
loader.grub.extraConfig = '' loader.grub.extraConfig = ''
@ -15,6 +16,10 @@ in
terminal_input --append serial terminal_input --append serial
terminal_output --append serial terminal_output --append serial
''; '';
initrd.kernelModules = [
"nvme"
];
}; };
swapDevices = [ swapDevices = [
@ -33,8 +38,8 @@ in
"/boot/efi" = "/boot/efi" =
{ {
device = "/dev/disk/by-uuid/4478-6009"; device = "/dev/disk/by-uuid/4478-6009";
fsType = "ext4"; fsType = "vfat";
};
}; };
}; };
} // qemu-guest);
} }

View file

@ -9,8 +9,8 @@ inputs: {
magic_rb = { magic_rb = {
grub = { grub = {
enable = true; enable = true;
efi.enable = false; efi.enable = true;
devices = [ "/dev/disk/by-id/scsi-360646ec4d8e14b45b588dcafaf0b511b" ]; devices = [ "nodev" ];
}; };
pins = { pins = {