diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 16bcaa3..bc83470 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -12,7 +12,7 @@ "nvme" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; disko.devices = { @@ -71,5 +71,5 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.enableRedistributableFirmware = true; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix index 3098081..9f87c3b 100644 --- a/etcnixos/vm.nix +++ b/etcnixos/vm.nix @@ -5,20 +5,6 @@ ... }: { - - environment.systemPackages = with pkgs; [ - # https://github.com/quickemu-project/quickemu - (quickemu.overrideAttrs (old: { - patches = [ - # patch to allow forcing a specific ISO file via an environment variable `FILE_NAME` - (pkgs.fetchpatch { - url = "https://github.com/Titaniumtown/quickemu/commit/f96d52a6b6f4b3187171d8cab61a273475da3b6c.diff"; - sha256 = "vXVI4EeJGhOlx8ARTCvB98Ajalk0bVakL98WojqcI3c="; - }) - ]; - })) - ]; - programs.virt-manager.enable = true; users.groups.libvirtd.members = [ username ]; @@ -33,16 +19,18 @@ pkgs.qemu_kvm.overrideAttrs (old: { patches = old.patches ++ [ # amd? - # (pkgs.fetchpatch { - # url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch"; - # sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA="; - # }) + (pkgs.fetchpatch { + url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch"; + sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA="; + }) # or intel! - (pkgs.fetchpatch { - url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch"; - sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg="; - }) + /* + (pkgs.fetchpatch { + url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch"; + sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg="; + }) + */ ]; }) ); diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix index 351100c..234d746 100644 --- a/home-manager/home-mreow.nix +++ b/home-manager/home-mreow.nix @@ -23,8 +23,6 @@ home.packages = with pkgs; [ wdisplays - intel-gpu-tools - blueman # used by /etc/nixos logic to launch niri