From bac328949f86ad2e012d7c110fa21df38656c337 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 31 May 2024 01:55:40 +0800 Subject: [PATCH] home/sway: use Qt v6.7's text-input-v3 --- home/applications/sway/default.nix | 9 ++++----- nixos/profiles/common/opt-in/gaming/home/default.nix | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix index 79023bb..18e7018 100644 --- a/home/applications/sway/default.nix +++ b/home/applications/sway/default.nix @@ -19,16 +19,15 @@ services.udiskie.enable = true; home.sessionVariables = { - GTK_IM_MODULE = lib.mkForce "wayland"; # use text-input-v3 + # NOTE: don't use "wayland" in GTK_IM_MODULE! it will crash X11 electron apps + GTK_IM_MODULE = lib.mkForce ""; # use text-input-v3 + QT_IM_MODULE = lib.mkForce ""; # use text-input-v3 }; wayland.windowManager.sway = { enable = true; checkConfig = false; # wtf? - extraOptions = [ - "--unsupported-gpu" - #"-Dnoscanout" - ]; + extraOptions = ["--unsupported-gpu"]; wrapperFeatures.gtk = true; systemd.xdgAutostart = true; config = { diff --git a/nixos/profiles/common/opt-in/gaming/home/default.nix b/nixos/profiles/common/opt-in/gaming/home/default.nix index 2455670..3b612a1 100644 --- a/nixos/profiles/common/opt-in/gaming/home/default.nix +++ b/nixos/profiles/common/opt-in/gaming/home/default.nix @@ -12,9 +12,6 @@ in { (prismlauncher.override {glfw = glfw-wayland-minecraft;}) (steam.override { extraEnv = { - # https://github.com/ValveSoftware/steam-for-linux/issues/781#issuecomment-2004757379 - GTK_IM_MODULE = "xim"; - # STEAM_EXTRA_COMPAT_TOOLS_PATHS = gamePkgs.proton-ge; }; })