diff --git a/configs/qemu.nix b/configs/qemu.nix new file mode 100644 index 0000000..6c12d21 --- /dev/null +++ b/configs/qemu.nix @@ -0,0 +1,9 @@ +{ + libvirtd = { + enable = true; + qemu = { + swtpm.enable = true; + }; + }; + spiceUSBRedirection.enable = true; +} diff --git a/configuration.nix b/configuration.nix index 94c530c..bb9f25f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -118,13 +118,6 @@ defaultNetwork.settings.dns_enabled = true; }; diskSize = 262144; - libvirtd = { - enable = true; - qemu = { - swtpm.enable = true; - }; - }; - spiceUSBRedirection.enable = true; }; services.tailscale.enable = true; diff --git a/flake.nix b/flake.nix index ec9e00f..1a5d04e 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ in { nixosConfigurations = lib.genAttrs [ "imladris" + "ono-sendai" "orion" "rift" "sk" diff --git a/hw/imladris/default.nix b/hw/imladris/default.nix index 6d33f24..d68b465 100644 --- a/hw/imladris/default.nix +++ b/hw/imladris/default.nix @@ -4,5 +4,6 @@ imports = [ ./hardware-configuration.nix ../../configs/desktop.nix + ../../configs/qemu.nix ]; } diff --git a/hw/ono-sendai/default.nix b/hw/ono-sendai/default.nix new file mode 100644 index 0000000..6d33f24 --- /dev/null +++ b/hw/ono-sendai/default.nix @@ -0,0 +1,8 @@ +{ inputs, ... }: + +{ + imports = [ + ./hardware-configuration.nix + ../../configs/desktop.nix + ]; +} diff --git a/hw/ono-sendai/hardware-configuration.nix b/hw/ono-sendai/hardware-configuration.nix new file mode 100644 index 0000000..4992093 --- /dev/null +++ b/hw/ono-sendai/hardware-configuration.nix @@ -0,0 +1,29 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/mapper/luks-8ee08e44-2662-420e-82b0-cc039582d15e"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-8ee08e44-2662-420e-82b0-cc039582d15e".device = "/dev/disk/by-uuid/8ee08e44-2662-420e-82b0-cc039582d15e"; + + swapDevices = + [ { device = "/dev/mapper/luks-566007fb-343e-4d66-8149-fbc808128930"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hw/orion/default.nix b/hw/orion/default.nix index d6960dd..2794864 100644 --- a/hw/orion/default.nix +++ b/hw/orion/default.nix @@ -3,5 +3,6 @@ imports = [ ./hardware-configuration.nix ../../configs/desktop.nix + ../../configs/qemu.nix ]; }