diff --git a/hosts/modules/gui/sxmo/default.nix b/hosts/modules/gui/sxmo/default.nix index 609b5bfc..a91cc26f 100644 --- a/hosts/modules/gui/sxmo/default.nix +++ b/hosts/modules/gui/sxmo/default.nix @@ -329,8 +329,10 @@ in # TODO: only need the share/sxmo directly linked "${package}/share" ]; - } // (lib.filterAttrs # certain settings are read before the `profile` is sourced - (k: v: k == "SXMO_DISABLE_CONFIGVERSION_CHECK") + } // (lib.filterAttrs (k: v: + k == "SXMO_DISABLE_CONFIGVERSION_CHECK" # read before `profile` is sourced + || k == "SXMO_TERMINAL" # for apps launched via `swaymsg exec -- sxmo_terminal.sh ...` + ) cfg.settings ); diff --git a/pkgs/additional/sxmo-utils/default.nix b/pkgs/additional/sxmo-utils/default.nix index 22202e4b..36832f39 100644 --- a/pkgs/additional/sxmo-utils/default.nix +++ b/pkgs/additional/sxmo-utils/default.nix @@ -90,6 +90,21 @@ let url = "https://git.uninsane.org/colin/sxmo-utils/commit/dd17fd707871961906ed4577b8c89f6128c5f121.patch"; hash = "sha256-Giek1MbyOtlPccmT8XQkLZWhX+EeJdzWVZtNgcLuTsI="; }) + (fetchpatch { + # experimental patch to launch apps via `swaymsg exec -- ` + # this allows them to detach from sxmo_appmenu.sh (so, `pstree` looks cleaner) + # and more importantly they don't inherit the environment of sxmo internals (i.e. PATH). + # suggested by Aren in #sxmo. + # + # old pstree look: + # - sxmo_hook_inputhandler.sh volup_one + # - sxmo_appmenu.sh + # - sxmo_appmenu.sh applications + # - + name = "sxmo_hook_apps: launch apps via the window manager"; + url = "https://git.uninsane.org/colin/sxmo-utils/commit/45782db02f6f54f9921db09cb1e3f7108b46d5f8.patch"; + hash = "sha256-FlbiF9B3GcUsozssXSaUoQpRPNj9DOTkcBnQaue+Ve4="; + }) ]; }; in {