wayfire: init at 0.6.0 #86606

alyssais · 2020-05-02T18:31:10Z

Motivation for this change

I’ve been working this for the past few days independently of #86569, which I just saw. We should compare the two and see if we can combine approaches.

The major difference is that this PR supports Wayfire plugins through a standard Nixpkgs-style wayfire.withPackages interface. Upstream Wayfire only works if plugins are installed into Wayfire’s prefix, which isn’t really an option for us, at least with arbitrary plugins. But the good news is they understand the problem, and are willing to accept my patches. So everything that’s a patch in this PR should hopefully be part of the next Wayfire release, at which point these patches can all be dropped.

Things done

alyssais · 2020-05-02T20:41:05Z

I’ve realised that wcm will need to be wrapped too, so I’d like to come up with some nice function that maybe gives you an attrset with wlc and wayfire packages, both wrapped with the right environment variables set. The hard part is coming up with a name…

alyssais · 2020-05-03T13:30:51Z

I’ve realised that wlc will need to be wrapped too, so I’d like to come up with some nice function that maybe gives you an attrset with wlc and wayfire packages, both wrapped with the right environment variables set. The hard part is coming up with a name…

I've now done this: Wayfire and WCM can both be built with a custom plugin set like so: with wayfireApplications.withPlugins (ps: with ps; [ wf-shell ]); [ wayfire wcm ] The default wayfireApplications in Nixpkgs has just wf-shell available. An unwrapped wayfireApplications is available as wayfireApplications-unwrapped.

wucke13 · 2020-05-04T11:25:03Z

You may add me to the maintainers, if you'd like to.

alyssais · 2020-05-07T15:48:50Z

You may add me to the maintainers, if you'd like to.

Done! :) What do you think of the PR? Is there anything from yours you think we should incorporate?

wucke13

I left a few comments and questions. Mostly things that I don't understand 😆
In general, the PR looks good to me. Compilation works, including icons for wcm and wf-shell

wucke13 · 2020-05-09T08:12:30Z

pkgs/applications/window-managers/wayfire/default.nix

+    ];
+
+    strictDeps = true;
+    nativeBuildInputs = [ meson ninja pkg-config wayland git ];


Why are git and wayland in the nativeBuildInputs?

Wayland was there for wayland-scanner. Not sure why git was there. Seems to work fine without it so I’ll drop it.

wucke13 · 2020-05-09T08:13:40Z

pkgs/applications/window-managers/wayfire/default.nix

+      wayland-protocols wf-config wlroots
+    ];
+
+    mesonFlags = [ "--sysconfdir" "/etc" ];


Why is this needed?

So that Wayfire default configuration files can be placed in /etc. Otherwise people would have no way to set those, because Wayfire would look in its prefix, which can’t be altered.

wucke13 · 2020-05-09T08:17:33Z

pkgs/applications/window-managers/wayfire/wf-config.nix

+  strictDeps = true;
+  nativeBuildInputs = [ meson ninja pkg-config ];
+  buildInputs = [ libevdev libxml2 ];
+  propagatedBuildInputs = [ glm ];


Out of curiosity, why is propagatedBuildInputs used here for the glm dep?

Because any package that has wf-config as an input also needs glm as an input. This would otherwise have to be copied every time something had a wf-config input.

wucke13 · 2020-05-09T08:18:19Z

pkgs/applications/window-managers/wayfire/wf-shell.nix

+  ];
+
+  strictDeps = true;
+  nativeBuildInputs = [ meson ninja pkg-config wayland git ];


~~Again, isn't this missing the wrapGAppsHook~~?
It is not, because of gnome.gtk in buildInputs?

wucke13 · 2020-05-09T08:22:35Z

pkgs/top-level/all-packages.nix

+
+  wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
+  inherit (wayfireApplications) wayfire wcm;
+


I would prefer these to be sorted alphanumerical. Maybe like this:

wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { }; wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix { inherit (wayfireApplications-unwrapped) wayfire; }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };

Also: How does this work without defining wcm as a package?

Also: How does this work without defining wcm as a package?

{ inherit (wayfireApplications) wayfire wcm; }

is equivalent to

{ wayfire = wayfireApplications.wayfire; wcm = wayfireApplications.wcm; }

I’ll resort alphabetically :)

wucke13 · 2020-05-09T09:27:24Z

Huh, on running this standalone I lost the icons on wcm. Maybe wrapGAppsHook is necessary?

Also: We should look at adding some facility for launching dbus to the package. Otherwise things like the gnome pinentry won't work.
ATM I'm using this alias in my shell rc, however that is not such a nice solution:

alias wayfire='[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && export `dbus-launch`; MESA_LOADER_DRIVER_OVERRIDE=i965 wayfire'

ping @alyssais

alyssais · 2020-06-02T01:39:08Z

Sorry for being slow with this.

Huh, on running this standalone I lost the icons on wcm. Maybe wrapGAppsHook is necessary?

I tried adding that to both wf-shell and wcm, but still no icons. Any other ideas? Did it work in your PR?

Also: We should look at adding some facility for launching dbus to the package. Otherwise things like the gnome pinentry won't work.

Good idea. I’ll have a look at the sway wrapper and see what goodies we can steal.

wucke13 · 2020-06-02T08:48:13Z

Sorry for being slow with this.

No worries!

I tried adding that to both wf-shell and wcm, but still no icons. Any other ideas? Did it work in your PR?

In my PR all icons but the one on the "Back" icon work.

Good idea. I’ll have a look at the sway wrapper and see what goodies we can steal.

Sweet!

wucke13 · 2020-08-05T12:14:28Z

@alyssais
What about the new release? Can you update your PR accordingly?

alyssais · 2020-08-11T17:55:49Z

> I tried adding that to both wf-shell and wcm, but still no icons. Any other ideas? Did it work in your PR? In my PR all icons but the one on the "Back" icon work.

I tried out your PR, and while icons for individual settings views in WCM, the header icons didn't. I managed to get this PR to the same functionality, but it's still not quite right.

wucke13 · 2020-08-13T21:58:51Z

@alyssais What icons are missing? I think the issue which I meant is solved in your PR:

alyssais · 2020-08-14T12:52:55Z

@alyssais What icons are missing? I think the issue which I meant is solved in your PR:

Interesting! I don't get the "General", "Accessibility", etc. icons. Do you have GNOME enabled?

wucke13 · 2020-08-15T11:05:42Z

No, but I had it installed. So maybe it did some GTK RC magic which fixes the issue?

alyssais · 2020-12-12T00:17:05Z

I've realised that I have the same problem with other GTK applications, so it's not a Wayfire issue and therefore doesn't need to hold up this PR. As for the D-Bus stuff, it's really not an area I know anything about, so I think it would be best addressed by somebody else as a follow-up to this PR. So my plan here I think is to update to the newest Wayfire release, and then if there's nothing else outstanding I'll merge not long afterward.

The top-level "wayfire" attribute is a Wayfire with wf-shell installed and nothing else. But wayfireApplications.withPlugins can be used to create a Wayfire with arbitrary plugins, or no plugins at all.

diamondburned · 2020-12-21T23:38:52Z

pkgs/applications/window-managers/wayfire/wcm.nix

+    owner = "WayfireWM";
+    repo = "wcm";
+    rev = "v${version}";
+    sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg";


I seem to get a hash mismatch with this:

unpacking source archive /build/v0.6.0.tar.gz hash mismatch in fixed-output derivation '/nix/store/lbyaykpqg15k20v18qvmmzyar7vdd3w6-source': wanted: sha256:1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg got: sha256:0xdjrmpdwag2d7bhqa2iall0rdsqpzfgix279lp2zy1ldw9gzg1n

alyssais mentioned this pull request May 2, 2020

wayfire: init at 0.4.0 #86569

Closed

10 tasks

alyssais changed the title ~~wayfire: 0.4.0~~ wayfire: init at 0.4.0 May 2, 2020

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 2, 2020

alyssais force-pushed the wayfire branch from 04710f9 to 0ba44c2 Compare May 3, 2020 13:27

ofborg bot removed 10.rebuild-darwin: 1 10.rebuild-linux: 1 labels May 3, 2020

Thra11 mentioned this pull request May 4, 2020

wayfire: init at 0.3.1 #76759

Closed

10 tasks

alyssais force-pushed the wayfire branch from 0ba44c2 to 432eb67 Compare May 7, 2020 14:31

ofborg bot requested a review from wucke13 May 7, 2020 14:46

wucke13 approved these changes May 9, 2020

View reviewed changes

alyssais force-pushed the wayfire branch from 432eb67 to 0e6c253 Compare June 2, 2020 01:37

ofborg bot requested a review from wucke13 June 2, 2020 01:45

alyssais force-pushed the wayfire branch 2 times, most recently from 797f227 to a841fbb Compare August 11, 2020 17:52

alyssais changed the title ~~wayfire: init at 0.4.0~~ wayfire: init at 0.5.0 Aug 11, 2020

alyssais added 5 commits December 12, 2020 00:29

wf-config: init at 0.6.0

febdd05

wayfire: init at 0.6.0

89e8489

wf-shell: init at 0.6.1

8e0f7cc

wcm: init at 0.6.0

761cbd9

wayfire: add plugin support

80dbf71

The top-level "wayfire" attribute is a Wayfire with wf-shell installed and nothing else. But wayfireApplications.withPlugins can be used to create a Wayfire with arbitrary plugins, or no plugins at all.

alyssais force-pushed the wayfire branch from a841fbb to 80dbf71 Compare December 12, 2020 00:32

alyssais changed the title ~~wayfire: init at 0.5.0~~ wayfire: init at 0.6.0 Dec 12, 2020

alyssais merged commit c898def into NixOS:master Dec 19, 2020

alyssais deleted the wayfire branch December 19, 2020 01:41

diamondburned reviewed Dec 21, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wayfire: init at 0.6.0 #86606

wayfire: init at 0.6.0 #86606

alyssais commented May 2, 2020

alyssais commented May 2, 2020 •

edited

alyssais commented May 3, 2020 via email

wucke13 commented May 4, 2020

alyssais commented May 7, 2020 via email

wucke13 left a comment

wucke13 May 9, 2020

alyssais Jun 2, 2020

wucke13 May 9, 2020

alyssais Jun 2, 2020

wucke13 May 9, 2020

alyssais Jun 2, 2020

wucke13 May 9, 2020

wucke13 May 9, 2020

alyssais Jun 2, 2020

alyssais Jun 2, 2020

wucke13 commented May 9, 2020 •

edited

alyssais commented Jun 2, 2020

wucke13 commented Jun 2, 2020

wucke13 commented Aug 5, 2020

alyssais commented Aug 11, 2020 via email

wucke13 commented Aug 13, 2020

alyssais commented Aug 14, 2020 via email

wucke13 commented Aug 15, 2020

alyssais commented Dec 12, 2020 via email

diamondburned Dec 21, 2020


		wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
		inherit (wayfireApplications) wayfire wcm;

wayfire: init at 0.6.0 #86606

wayfire: init at 0.6.0 #86606

Conversation

alyssais commented May 2, 2020

Motivation for this change

Things done

alyssais commented May 2, 2020 • edited

alyssais commented May 3, 2020 via email

wucke13 commented May 4, 2020

alyssais commented May 7, 2020 via email

wucke13 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

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

wucke13 commented May 9, 2020 • edited

alyssais commented Jun 2, 2020

wucke13 commented Jun 2, 2020

wucke13 commented Aug 5, 2020

alyssais commented Aug 11, 2020 via email

wucke13 commented Aug 13, 2020

alyssais commented Aug 14, 2020 via email

wucke13 commented Aug 15, 2020

alyssais commented Dec 12, 2020 via email

Choose a reason for hiding this comment

alyssais commented May 2, 2020 •

edited

wucke13 commented May 9, 2020 •

edited