Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sway: Install the wallpapers by default and use them on NixOS #122995

Merged
merged 1 commit into from
Nov 21, 2021

Conversation

primeos
Copy link
Member

@primeos primeos commented May 14, 2021

Size impact:
$ du -sh $(nix-build -A sway-unwrapped)
5.9M /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6
nix@sessel:/var/tmp/michael/nixpkgs$ du -sh $(nix-build -A sway-unwrapped)/share/backgrounds
4.9M /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6/share/backgrounds

Screenshot:
sway_exit

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Size impact:
$ du -sh $(nix-build -A sway-unwrapped)
5.9M    /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6
nix@sessel:/var/tmp/michael/nixpkgs$ du -sh $(nix-build -A sway-unwrapped)/share/backgrounds
4.9M    /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6/share/backgrounds
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels May 14, 2021
@primeos primeos mentioned this pull request May 14, 2021
10 tasks
@@ -44,7 +47,6 @@ stdenv.mkDerivation rec {
];

mesonFlags = [
"-Ddefault-wallpaper=false"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also considered "-Ddefault-wallpaper=${boolToString isNixOS}" but I think the best approach might be to add a wallpaper output (and add that to the NixOS module - which makes it still difficult to override but 5 MB are hopefully not that bad - or we keep it as it is).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW Arch installs them by default so I guess this should actually be fine: https://archlinux.org/packages/community/x86_64/sway/

@grahamc
Copy link
Member

grahamc commented May 14, 2021

It seems to me we may want to instead default it to using NixOS themed wallpapers?

@ofborg ofborg bot requested review from Ma27 and Synthetica9 May 14, 2021 14:49
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 14, 2021
@primeos
Copy link
Member Author

primeos commented May 14, 2021

@grahamc that's a good question. Personally I prefer sticking to the upstream defaults but if we already default to NixOS themed wallpapers for other compositors/DEs/WMs (e.g. Gnome/KDE) then it might be best to do the same for Sway.

@Synthetica9
Copy link
Member

I somehow feel it'd be pretty weird if the non-NixOS install came with custom wallpapers... I'd be fine with a Nix wallpaper on NixOS tho

@primeos primeos marked this pull request as ready for review May 27, 2021 09:34
@primeos primeos mentioned this pull request May 27, 2021
22 tasks
@Synthetica9
Copy link
Member

Sure thing!

@Synthetica9 Synthetica9 merged commit 5a14b59 into NixOS:master Nov 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants