[ghost]

Description of changes

Adds the Budgie Desktop to NixOS (this includes all of the remaining packages, and a NixOS module with a test).

This patch fixes #190192.

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 23.05 Release Notes (or backporting 22.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

[ghost]

When making this patch I looked up every reference to /usr and found this. This isn't in GNOME Control Center's paths.patch, I'm not sure if that's on purpose?

[bobby285271]

This is previously patched in 1de94d5 but it's later dropped in fcf2213, not sure the reason. Is adding users in *-control-center actually works with e.g. users.mutableUsers enabled (since I think only cc-add-user-dialog uses it)?

(Ha! Saw @jtojnar in gnome-control-center!653)

[jtojnar]

Hmm, maybe it was removed accidentally, though it does not look like the surrounding code changed to cause a merge conflict.

[ghost]

Is adding users in *-control-center actually works with e.g. users.mutableUsers enabled

I was able to create a new user and log in with its account.

Screenshots

[bobby285271]

@ofborg test budgie
@ofborg eval

VM starts. This is much more vanilla than my last try on budgie-nix flake, I will try to do some comparison 😆 Do you have a preference (on the defaults) here? (since looks like upstream does not like e.g. Adwaita gtk theme and icon theme)

Edit: having a default wallpaper will also be nice :-)

[JoshStrobl]

@ofborg test budgie

VM starts. This is much more vanilla than my last try on budgie-nix flake, I will try to do some comparison laughing Do you have a preference (on the defaults) here? (since looks like upstream does not like e.g. Adwaita gtk theme and icon theme)

My recommendation for the defaults are Papirus Icon Theme and either Materia GTK Theme (mind you that Materia is not maintained) or Pocillo, with built-in theme enabled (this is the default). Both Fedora Budgie Spin and the respective Fedora budgie-desktop-defaults package, as well as Solus, use Papirus + Materia. Ubuntu Budgie uses Pocillo for the mix between Arc GTK Theme color palette and Materia Design components, with their Pocillo Icon Theme (mix of Moka and Faba).

[ghost]

• I decided at the last moment to rewrite the whole module and kind of left theming for later, I'll add back Qogir as we were using in budgie-nix. As for the wallpaper I guess we can keep using the (cooler) nineish-dark-gr{a,e}y instead of the one used in the other desktops. DONE.

• I forgot the plugin support stuff in the heat of the moment, I will add it back. budgie-nix has a few plugins for testing until they land in Nixpkgs.

• budgie-desktop-view can be put into a separate module as it is in budgie-nix, since there's nothing Budgie-specific on it (as far as I know) that wouldn't allow it to run in, for example, a standalone WM. I'm not sure if that's something upstream wants to support (@JoshStrobl).

• Some MATE apps require a patch to show up on Budgie, last time I checked those were merged upstream, should I add the patches or wait for the stable releases?

[bobby285271]

I guess it should be fine to do the patching here if they are easy to review (e.g. mate-desktop/caja@f46fe89)

[JoshStrobl]

• budgie-desktop-view can be put into a separate module as it is in budgie-nix, since there's nothing Budgie-specific on it (as far as I know) that wouldn't allow it to run in, for example, a standalone WM. I'm not sure if that's something upstream wants to support (@JoshStrobl).

Budgie Desktop View has Budgie Desktop specific functionality, specifically we have right-click options that open up Budgie Control Center and Budgie Desktop Settings.

Per its readme:

Budgie Desktop View is designed for the Budgie Desktop. Usage outside of Budgie is not supported and is outside this project's scope.

I would recommend Nemo over Caja, as Caja has the tendency to trigger its desktop icons implementation and their background / wallpaper rendering uses their own schemas, so there is a chance that can get triggered and doesn't make for an amazing experience. Mind you this was also with their implementation "disabled" and it didn't seem to respect it. But yea, Caja will show up at least if you add that patch.

[ghost]

Per its readme:

Budgie Desktop View is designed for the Budgie Desktop. Usage outside of Budgie is not supported and is outside this project's scope.

Welp, I could've just RTFM I guess 😆. I'm going to leave it as is then.

Caja has the tendency to trigger its desktop icons implementation and their background / wallpaper rendering uses their own schemas, so there is a chance that can get triggered and doesn't make for an amazing experience. Mind you this was also with their implementation "disabled" and it didn't seem to respect it.

That's marvelous.

[ghost]

[Krutonium]

Very happy to see progress on this! Thank you :D

[ghost]

Is there a way to rebase this PR on top of a more recent Nixpkgs? I'm on a new system and building the test takes a while because it downloads older packages.

[bobby285271]

I commonly rebase to nixos-unstable (not master unless merge conflicts, since if you are not lucky you sometimes need to build webkitgtk) git fetch origin nixos-unstable:nixos-unstable && git rebase nixos-unstable (all my branches are unshallowed, this is actually more convenient to me after the first full clone tbh).

I will actually also recommend testing this against the GNOME 44 PR (though if you rebase against this you cannot push the rebased commits here since things will mess up), the most recent finished eval is 7c49b47, mainly for mutter 44 (I think budgie should already support that) and glib 2.76 (for the slice allocator removal).

[bobby285271]

I cannot set wallpaper in budgie-control-center (cc-background-chooser-WARNING **: 13:30:46.767: could not general thumbnail file:///home/bobby285271/xxxx.png (image/png) Could not find thumbnailer for mime-type 'image/png'). Did you remove those support by accident?

Otherwise with a brief testing this looks okay to me.

[ghost]

I rewrote budgie-control-center using gnome-control-center as base, and added budgie-backgrounds.

Screenshot

[bobby285271]

@ofborg test budgie

I rewrote budgie-control-center using gnome-control-center as base

Hmmm, probably just add the necessary stuff, I find some of the dep weird to appear here, e.g.

• libsoup: I imagine this no longer depends on it? Since e.g. gnome-online-accounts is ported to libsoup_3, this will become something that link against both 2 and 3 otherwise (and that should lead to some crashing)
• tracker-miners (also tracker maybe): The comment says for search locations dialog but I haven't found a cc-search-locations-dialog yet.

(Btw is your testing all good right now? We really want this in 23.05)

[JoshStrobl]

Search Locations was removed in Budgie Control Center in BuddiesOfBudgie/budgie-control-center@434c551 as Budgie Desktop does not have that sort of functionality. tracker is not required for any Budgie components.

In the case of libsoup, as you noted it is not required for Budgie Control Center but rather required for gnome-online-accounts. It may have been pulled in for goa-1.0 / goa-backend-1.0 but it should be a dep of those not BCC. BCC does not link against it.

[ghost]

Okay, I removed those dependencies.

[bobby285271]

Okay let's go. Improvements can still be done in follow-up PRs 🙈

If you wish, you can add a budgie section, config, screenshot to calamares-nixos-extensions (you might probably grep for e.g. xfce for how to do that, or find @vlinkz for help).