sway: add 'xwayland disable' to sway config if disabled (#2568)

Closes #2567

modules/services/window-managers/i3-sway/sway.nix

@@ -311,10 +311,10 @@ let
       )}
     ''
   else
-    "") + "\n" + (if cfg.systemdIntegration then ''
+    "") + (concatStringsSep "\n" ((optional cfg.systemdIntegration ''
-      exec "systemctl --user import-environment; systemctl --user start sway-session.target"
+      exec "systemctl --user import-environment; systemctl --user start sway-session.target"'')
-    '' else
+      ++ (optional (!cfg.xwayland) "xwayland disable")
-      "") + cfg.extraConfig);
+      ++ [ cfg.extraConfig ])));
 
   defaultSwayPackage = pkgs.sway.override {
     extraSessionCommands = cfg.extraSessionCommands;

tests/modules/services/window-managers/sway/default.nix

@@ -5,6 +5,7 @@
   sway-followmouse = ./sway-followmouse.nix;
   sway-followmouse-legacy = ./sway-followmouse-legacy.nix;
   sway-modules = ./sway-modules.nix;
+  sway-no-xwayland = ./sway-no-xwayland.nix;
   sway-null-config = ./sway-null-config.nix;
   sway-null-package = ./sway-null-package.nix;
   sway-post-2003 = ./sway-post-2003.nix;

tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf

@@ -110,5 +110,4 @@ bar {
   
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-bindkeys-to-code.conf

@@ -110,5 +110,4 @@ bar {
   
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-default.conf

@@ -110,5 +110,4 @@ bar {
   
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-followmouse-expected.conf

@@ -83,5 +83,4 @@ bindsym k resize shrink height 10 px
 bindsym l resize grow width 10 px
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf

@@ -83,5 +83,4 @@ bindsym k resize shrink height 10 px
 bindsym l resize grow width 10 px
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-modules.conf

@@ -122,5 +122,4 @@ bar {
   
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-no-xwayland.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [ ./sway-stubs.nix ];
+
+  wayland.windowManager.sway = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
+    config = null;
+    systemdIntegration = false;
+    xwayland = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/sway/config
+    assertFileContent home-files/.config/sway/config \
+        ${
+          pkgs.writeText "expected" ''
+            xwayland disable
+                    ''
+        }
+  '';
+}

tests/modules/services/window-managers/sway/sway-null-config.nix

@@ -13,6 +13,6 @@
   nmt.script = ''
     assertFileExists home-files/.config/sway/config
     assertFileContent home-files/.config/sway/config \
-      ${pkgs.writeText "expected" "\n"}
+      ${pkgs.writeText "expected" ""}
   '';
 }

tests/modules/services/window-managers/sway/sway-null-package.conf

@@ -110,5 +110,4 @@ bar {
   
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf

@@ -109,5 +109,4 @@ bar {
   
 }
 
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf

@@ -114,5 +114,4 @@ workspace "1" output eDP
 workspace "ABC" output DP
 workspace "3: Test" output HDMI
 workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output DVI
-
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"