From 776b238d9ce750b19bb3089118df25950dab28da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 17 Jan 2024 10:59:01 +0100 Subject: [PATCH 1/2] disable state home for now --- nixosModules/clanCore/state.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixosModules/clanCore/state.nix b/nixosModules/clanCore/state.nix index 3a1c4ffed..4817a2fe4 100644 --- a/nixosModules/clanCore/state.nix +++ b/nixosModules/clanCore/state.nix @@ -1,7 +1,8 @@ { lib, ... }: { # defaults - config.clanCore.state.HOME.folders = [ "/home" ]; + # FIXME: currently broken, will be fixed soon + #config.clanCore.state.HOME.folders = [ "/home" ]; # interface options.clanCore.state = lib.mkOption { From 1d2f00321056cf9c255addbbb3a99fae5a540343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 17 Jan 2024 11:00:45 +0100 Subject: [PATCH 2/2] use upstream qemu for wayland feature --- pkgs/clan-cli/clan_cli/vms/run.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py index 7e2f3654e..65515ffee 100644 --- a/pkgs/clan-cli/clan_cli/vms/run.py +++ b/pkgs/clan-cli/clan_cli/vms/run.py @@ -225,10 +225,7 @@ def run_vm( disk_img=disk_img, ) - if vm.wayland: - packages = ["git+https://git.clan.lol/clan/clan-core.git#qemu-wayland"] - else: - packages = ["nixpkgs#qemu"] + packages = ["nixpkgs#qemu"] env = os.environ.copy() if vm.graphics and not vm.wayland: