diff --git a/flake.lock b/flake.lock index ffed8c6..5192622 100644 --- a/flake.lock +++ b/flake.lock @@ -38,24 +38,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "libkrun-src": { "flake": false, "locked": { @@ -130,8 +112,7 @@ "libkrunfw-src": "libkrunfw-src", "muvm-src": "muvm-src", "nixpkgs": "nixpkgs", - "sidebus": "sidebus", - "virtwl": "virtwl" + "sidebus": "sidebus" } }, "rust-overlay": { @@ -193,46 +174,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "virtwl": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758075582, - "narHash": "sha256-o2lpXQLaM9QcZVr+sAxvh83CqJW1QkFhfja6K40ndmA=", - "ref": "wip", - "rev": "5a5df73a11b2f6bf671a8fc89926ac993e0fbb78", - "shallow": true, - "submodules": true, - "type": "git", - "url": "https://github.com/valpackett/wayland-proxy-virtwl" - }, - "original": { - "ref": "wip", - "shallow": true, - "submodules": true, - "type": "git", - "url": "https://github.com/valpackett/wayland-proxy-virtwl" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7b3fdbd..c4ef335 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,6 @@ flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - virtwl.url = "git+https://github.com/valpackett/wayland-proxy-virtwl?shallow=1&submodules=1&ref=wip"; - virtwl.inputs.nixpkgs.follows = "nixpkgs"; - sidebus.url = "git+https://git.clan.lol/clan/sidebus?shallow=1&ref=main"; sidebus.inputs.nixpkgs.follows = "nixpkgs"; @@ -36,7 +33,6 @@ self, nixpkgs, flake-parts, - virtwl, sidebus, muvm-src, libkrun-src, @@ -50,9 +46,9 @@ ]; flake = { - nixosModules.testvm = nixpkgs.lib.modules.importApply ./nixosModules/testvm.nix { inherit virtwl; }; + nixosModules.testvm = nixpkgs.lib.modules.importApply ./nixosModules/testvm.nix { }; nixosModules.default = nixpkgs.lib.modules.importApply ./nixosModules/default.nix { - inherit self virtwl sidebus; + inherit self sidebus; }; templates.musictest = { diff --git a/nixosModules/testvm.nix b/nixosModules/testvm.nix index 5acee69..4fa8c0d 100644 --- a/nixosModules/testvm.nix +++ b/nixosModules/testvm.nix @@ -1,4 +1,4 @@ -{ virtwl }: +{ }: { pkgs, ... }: { system.stateVersion = "25.11"; @@ -7,7 +7,6 @@ environment.systemPackages = [ pkgs.fastfetch pkgs.htop - virtwl.packages.${pkgs.stdenv.hostPlatform.system}.proxy pkgs.wayland-utils pkgs.weston pkgs.waycheck