From f776045d82fd9818922d6bd26b9b3c363dd9e583 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Feb 2026 13:23:10 -0500 Subject: [PATCH] vm: enable + android --- system/common.nix | 2 +- system/vm.nix | 33 +++------------------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/system/common.nix b/system/common.nix index 280c79d..8110256 100644 --- a/system/common.nix +++ b/system/common.nix @@ -11,7 +11,7 @@ }: { imports = [ - # ./vm.nix + ./vm.nix ./steam.nix ./networking.nix diff --git a/system/vm.nix b/system/vm.nix index 9f87c3b..e0f4b65 100644 --- a/system/vm.nix +++ b/system/vm.nix @@ -5,6 +5,9 @@ ... }: { + # android virtualization + virtualisation.waydroid.enable = true; + programs.virt-manager.enable = true; users.groups.libvirtd.members = [ username ]; @@ -13,36 +16,6 @@ enable = true; package = pkgs.libvirt; - - qemu = { - package = ( - 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="; - }) - - # 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="; - }) - */ - ]; - }) - ); - - ovmf.packages = lib.mkForce [ - (pkgs.OVMF.overrideAttrs (old: { - secureBoot = true; - tpmSupport = true; - # TODO! add patches from: https://github.com/Scrut1ny/Hypervisor-Phantom/tree/main/Hypervisor-Phantom/patches/EDK2 - })).fd - ]; - }; }; virtualisation.spiceUSBRedirection.enable = true;