Compare commits

..

3 Commits

Author SHA1 Message Date
22823ff55f update 2026-02-03 12:49:33 -05:00
d1ceb9fa6f waydroid -> waydroid-nftables 2026-02-02 13:33:49 -05:00
f776045d82 vm: enable + android 2026-02-02 13:23:10 -05:00
3 changed files with 48 additions and 70 deletions

78
flake.lock generated
View File

@@ -24,11 +24,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1769287525, "lastModified": 1769737823,
"narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -106,11 +106,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770053181, "lastModified": 1770140424,
"narHash": "sha256-YxLkG+tzWSX98pRt+4frXkZHPrHpu7afZXe9gCJ+aEo=", "narHash": "sha256-OjLbCjC7TpcZ07cxSmjzELafXBay861hIhrfrRMXZ98=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a4a3e2816dc1adff3fa15fcf01dd95bf556ec96f", "rev": "196631c2e3c55526c8a67bfa7f4f06aeb11ffac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -267,11 +267,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769949118, "lastModified": 1770064250,
"narHash": "sha256-Ue9kYZenqMw9yHGFnBpoWxQqhs2tlH/el4AxKVicXBE=", "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "0be0641613a13323a61a6406c46b6f28b8894395", "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -289,11 +289,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1770044450, "lastModified": 1770131791,
"narHash": "sha256-+lybmHhVmvQdEyRRjet6CUklqlXBI6d3X6He8W8OxR0=", "narHash": "sha256-RIRWfFGjLaRjc9hadAbvyf61U+0Vos75ck2aPZQWtpw=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "a4ac109ce799a7bba717c37e21f8ca15201b7cc0", "rev": "fb8e3ede565da2db8e04608cc59ba3d526476984",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -316,11 +316,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1769980417, "lastModified": 1770133761,
"narHash": "sha256-BOxPHApuXJE0wFKaDK811u5Ihvn4gnsXhCABo0O/u/Q=", "narHash": "sha256-3/2F3IfdyEz9ot0NytsVymt5Ma54EBBWcAc3CJKQFPE=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "ca6c544ca6a737bdb32676046bf98aca11f8f13d", "rev": "c44eff590edaff58ef9e34ecf38f6fbccb1be647",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -349,11 +349,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769577126, "lastModified": 1770092965,
"narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", "rev": "189917c93329c86ac2ddd89f459c26a028d590ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -374,11 +374,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1770023115, "lastModified": 1770109133,
"narHash": "sha256-Q9azPUVNEmMxZVW+y/XDHMthjq5Up9jTnArAdMDhaEM=", "narHash": "sha256-ZvFy7n6AEAFU9bJYE5LCecNiCXWVY6sWHu95OqJwg9E=",
"owner": "marienz", "owner": "marienz",
"repo": "nix-doom-emacs-unstraightened", "repo": "nix-doom-emacs-unstraightened",
"rev": "6659b85b1c9865382d2e522f3f7b60c3243fd8d6", "rev": "907ed01ec980745a8cfbcb2cbf8fb0612743361f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -442,11 +442,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770019141, "lastModified": 1770115704,
"narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -464,11 +464,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770000517, "lastModified": 1770100438,
"narHash": "sha256-LH5lC9yyvULGOgCLmptIFujm0vQiAXuIq4wAHcnUxmk=", "narHash": "sha256-E3YRaxVaAkbXkUupL2gn+QRRCZ3rn7Uc0RC3XIAXYS4=",
"owner": "yebei199", "owner": "yebei199",
"repo": "oh-my-opencode", "repo": "oh-my-opencode",
"rev": "cb229cff13565d44aa09868abdfe7ab5b6086feb", "rev": "25103f10a09534f5ab26e97824f833404e44fb11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -488,11 +488,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769069492, "lastModified": 1769939035,
"narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "rev": "a8ca480175326551d6c4121498316261cbb5b260",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -528,11 +528,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770001842, "lastModified": 1770088046,
"narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", "narHash": "sha256-4hfYDnUTvL1qSSZEA4CEThxfz+KlwSFQ30Z9jgDguO0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5018343419ea808f8a413241381976b7e60951f2", "rev": "71f9daa4e05e49c434d08627e755495ae222bc34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -660,11 +660,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769713942, "lastModified": 1770083504,
"narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", "narHash": "sha256-1CB57EPNjZOAjMeFzkG5wbzjuLuKT317alEK6JUf9sc=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", "rev": "75c9f5e77573b36b8d341c28c0d32e9c9a0a2309",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -683,11 +683,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770018638, "lastModified": 1770097899,
"narHash": "sha256-u9fl3Q+ZVPcwnfxGO1V997Gt0vT2m4lvfYp/QvSZRjw=", "narHash": "sha256-FKRpvwWR96VDW4bdsxIrZgIAXvdXqsCTaV1HghCJBoQ=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "fbbadeb3bbed799f5bd86094ebf186658764eb30", "rev": "615a27db86f3fddd0f096b5e9ea832795a4608d1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -11,7 +11,7 @@
}: }:
{ {
imports = [ imports = [
# ./vm.nix ./vm.nix
./steam.nix ./steam.nix
./networking.nix ./networking.nix

View File

@@ -5,6 +5,14 @@
... ...
}: }:
{ {
# android virtualization
virtualisation.waydroid = {
enable = true;
# https://github.com/NixOS/nixpkgs/pull/466473
package = pkgs.waydroid-nftables;
};
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
users.groups.libvirtd.members = [ username ]; users.groups.libvirtd.members = [ username ];
@@ -13,36 +21,6 @@
enable = true; enable = true;
package = pkgs.libvirt; 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; virtualisation.spiceUSBRedirection.enable = true;