From c0537c425208ca27fd1f3b8f36349177181f50a5 Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Wed, 20 Mar 2024 18:16:10 +0200 Subject: [PATCH] Enable labwc only for Lenovo X1 Signed-off-by: Mika Tammi --- modules/desktop/profiles/graphics.nix | 2 +- targets/lenovo-x1/guivmExtraModules.nix | 1 + targets/nvidia-jetson-orin/flake-module.nix | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/desktop/profiles/graphics.nix b/modules/desktop/profiles/graphics.nix index 529aea396..afbdb9929 100644 --- a/modules/desktop/profiles/graphics.nix +++ b/modules/desktop/profiles/graphics.nix @@ -14,7 +14,7 @@ in enable = mkEnableOption "Graphics profile"; compositor = mkOption { type = types.enum compositors; - default = "labwc"; + default = "weston"; description = '' Which Wayland compositor to use. diff --git a/targets/lenovo-x1/guivmExtraModules.nix b/targets/lenovo-x1/guivmExtraModules.nix index 642093b6d..d5afa52b4 100644 --- a/targets/lenovo-x1/guivmExtraModules.nix +++ b/targets/lenovo-x1/guivmExtraModules.nix @@ -38,6 +38,7 @@ guivmExtraConfigurations = { ghaf.hardware.definition.network.pciDevices = configH.ghaf.hardware.definition.network.pciDevices; + ghaf.profiles.graphics.compositor = "labwc"; ghaf.graphics.launchers = let hostAddress = "192.168.101.2"; powerControl = pkgs.callPackage ../../packages/powercontrol {}; diff --git a/targets/nvidia-jetson-orin/flake-module.nix b/targets/nvidia-jetson-orin/flake-module.nix index b4808d160..4b9d00e84 100644 --- a/targets/nvidia-jetson-orin/flake-module.nix +++ b/targets/nvidia-jetson-orin/flake-module.nix @@ -77,7 +77,6 @@ debug.enable = variant == "debug"; }; windows-launcher.enable = true; - profiles.graphics.compositor = "weston"; }; }