sway-beta module: add missing pieces #49687

ghost · 2018-11-03T12:48:03Z

Motivation for this change

Add missing pieces from main module. See comments below.

cc @colemickens @primeos

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Determined the impact on package closure size (by running nix path-info -S before and after)
Fits CONTRIBUTING.md.

ghost

Here are comments on why these changes needed.

ghost · 2018-11-03T12:49:30Z

nixos/modules/programs/sway-beta.nix

+
+  swayWrapped = pkgs.writeShellScriptBin "sway" ''
+    ${cfg.extraSessionCommands}
+    exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway


Needed to make dbus dependend programs to work (like libnotify notifications). Also official wiki recommends launching via dbus-launch for one particular case https://github.com/swaywm/sway/wiki#im-not-using-logind-but-still-want-dbuspolkitpower-management-to-work

I just packaged mako in my overlay an hour ago and just noticed it wasn't working.

This patch fixes it. Thanks.

@colemickens In case of X program you would also need exec dbus-update-activation-environment DISPLAY in your sway config

ghost · 2018-11-03T12:51:08Z

nixos/modules/programs/sway-beta.nix

+        export SDL_VIDEODRIVER=wayland
+        # needs qt5.qtwayland in systemPackages
+        export QT_QPA_PLATFORM=wayland
+        export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"


Needed to prepare environment. xkb options moved to sway config in sway-beta, so add another example here. Also mentioned in official wiki https://github.com/swaywm/sway/wiki#disabling-client-side-qt-decorations

xkb options moved to sway config in sway-beta, so add another example here

what do you mean "so add another example here" since it's no longer in the env vars?

@colemickens I mean instead of example provided in main module https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/programs/sway.nix#L33

ghost · 2018-11-03T12:52:07Z

nixos/modules/programs/sway-beta.nix

    extraPackages = mkOption {
      type = with types; listOf package;
      default = with pkgs; [
-        xwayland dmenu
+        xwayland rxvt_unicode dmenu


rxvt_unicode is needed for use with stock config. See ${pkgs.sway-beta}/etc/sway/config

colemickens · 2018-11-03T13:09:51Z

LGTM. Fixes at least one problem for me and likely more I didn't know about. Thanks!

primeos

Looks good, thanks :)

primeos · 2018-11-03T16:54:55Z

nixos/modules/programs/sway-beta.nix

+        export SDL_VIDEODRIVER=wayland
+        # needs qt5.qtwayland in systemPackages
+        export QT_QPA_PLATFORM=wayland
+        export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"


Mind adding the following or something similar to the examples (https://github.com/swaywm/sway/wiki/Running-programs-natively-under-wayland#java-under-xwayland)?:

# Fix for some Java AWT applications (e.g. Android Studio), # use this if they aren't displayed properly: export _JAVA_AWT_WM_NONREPARENTING=1

Without this e.g. Android-Studio won't be displayed properly (no content is shown after opening a project, only the window itself is visible). (We could also add it to the defaults but I'm not sure if there are any drawbacks.)

@primeos Sure, done!

colemickens · 2018-11-04T01:33:39Z

nixos/modules/programs/sway-beta.nix

+        export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+        # Fix for some Java AWT applications (e.g. Android Studio),
+        # use this if they aren't displayed properly:
+        export _JAVA_AWT_WM_NONREPARENTING=1


Is there any reason to not be doing GDK_BACKEND=wayland as well?

@colemickens Should be picked by default https://github.com/swaywm/sway/wiki/Running-programs-natively-under-wayland#gtk-30

Hm okay. It seems like emersion's most recent edit means that the QT_WAYLAND_DISABLE_WINDOWDECORATION isn't needed either. Or have you observed that it is needed?

@colemickens Tested on nixos-unstable. Both settings are still needed:
https://github.com/swaywm/sway/wiki#disabling-client-side-qt-decorations
Don't know why its strikethrough there https://github.com/swaywm/sway/wiki/Running-programs-natively-under-wayland#qt5 Maybe that setting is no more required with recent Qt release we don't have.

primeos · 2018-11-04T10:59:16Z

Thanks again :)

BTW: I just noticed that I forgot to check the commit message, according to CONTRIBUTING.md#submitting-changes it should've been "nixos/sway-beta: ...", but it's not really enforced in nixpkgs AFAIK (at least there are many commits without the "nixos/" prefix). It might be something to keep in mind for the next time though (for the consistency).

ghost · 2018-11-04T11:29:43Z

@primeos Got it, thanks!

GrahamcOfBorg added 6.topic: nixos 8.has: module (update) labels Nov 3, 2018

ghost commented Nov 3, 2018

View reviewed changes

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Nov 3, 2018

primeos reviewed Nov 3, 2018

View reviewed changes

sway-beta module: add missing pieces

15c2fb7

colemickens reviewed Nov 4, 2018

View reviewed changes

primeos approved these changes Nov 4, 2018

View reviewed changes

primeos merged commit f319c7f into NixOS:master Nov 4, 2018

ghost deleted the sway branch November 4, 2018 11:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sway-beta module: add missing pieces #49687

sway-beta module: add missing pieces #49687

ghost commented Nov 3, 2018 •

edited by ghost

Loading

ghost left a comment

ghost Nov 3, 2018

colemickens Nov 3, 2018

ghost Nov 3, 2018 •

edited by ghost

Loading

ghost Nov 3, 2018

colemickens Nov 3, 2018

ghost Nov 3, 2018

ghost Nov 3, 2018

colemickens commented Nov 3, 2018

primeos left a comment

primeos Nov 3, 2018

ghost Nov 3, 2018

colemickens Nov 4, 2018

ghost Nov 4, 2018

colemickens Nov 4, 2018

ghost Nov 4, 2018 •

edited by ghost

Loading

primeos commented Nov 4, 2018

ghost commented Nov 4, 2018

sway-beta module: add missing pieces #49687

sway-beta module: add missing pieces #49687

Conversation

ghost commented Nov 3, 2018 • edited by ghost Loading

Motivation for this change

Things done

ghost left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Nov 3, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

colemickens commented Nov 3, 2018

primeos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Nov 4, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

primeos commented Nov 4, 2018

ghost commented Nov 4, 2018

ghost commented Nov 3, 2018 •

edited by ghost

Loading

ghost Nov 3, 2018 •

edited by ghost

Loading

ghost Nov 4, 2018 •

edited by ghost

Loading