Merge staging-next into staging

2021-05-12 00:50:13 +00:00
parent 1f520667be 5a513ae14b
commit 5c4cda9988
28 changed files with 1171 additions and 374 deletions
@@ -14,6 +14,7 @@ let
  baseWrapper = writeShellScriptBin "sway" ''
     set -o errexit
     if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
+       export XDG_CURRENT_DESKTOP=sway
       ${extraSessionCommands}
       export _SWAY_WRAPPER_ALREADY_EXECUTED=1
     fi