Commit graph

115 commits

Author SHA1 Message Date
Bernardo Meurer 1b15c8da6c
swaybg: 1.1 -> 1.1.1 2022-03-11 11:47:16 -08:00
Adam Joseph 72473ff070 sway: use a more-accurate default for trayEnabled
This commit implements @primeos's suggestion here:

  https://github.com/NixOS/nixpkgs/pull/160972#pullrequestreview-901069355
2022-03-08 18:42:01 -08:00
Nick Cao e091b04977 swaylock: 1.5 -> 1.6 2022-03-08 05:11:30 +00:00
Adam Joseph c7a7acb034
sway: respect systemdSupport and dbusSupport (#160972)
Sway can be compiled with or without systemd(-logind) and dbus.  This
commit exposes that support via the global systemdSupport and
dbusSupport arguments, which are understood by many other nixpkgs
expressions and can be set globally in ~/.config/nixpkgs/config.nix.

This commit also adds a third argument, trayEnabled, which allows to
disable sway's tray.  The tray requires dbusSupport and
systemdSupport.

Reviewers of this commit asked for potential use cases.  There are
many of them; a very non-exhaustive list includes:

* Use of nixpkgs on operating systems which systemd does not support,
  such as MacOS/Darwin, FreeBSD, OpenBSD, or Alpine Linux.

* Use of nixpkgs on *-musl platforms, which systemd does not
  officially support (out-of-tree patches to support musl exist for a
  few systemd versions).

* Use of sway in situations where dbus is inappropriate, such as
  sway's "kiosk mode".

* High-security environments, where the additional attack surface
  exposed by dbus outweighs any features it may offer.

This is a very non-exhaustive list.
2022-03-06 13:39:31 +01:00
Adam Joseph db997037d7 swayidle: honor systemdSupport
This commit exposes support for compilation without systemd,
controlled by the global systemdSupport argument.  This argument is
understood by many other nixpkgs expressions and can be set globally
in ~/.config/nixpkgs/config.nix.
2022-02-23 14:33:29 -08:00
Martin Weinelt 1ab8a4f45b
sway: fix eval
The meson_0_60 attribute was removed because meson was migrated to 0.60.
2022-01-24 02:18:06 +01:00
Michael Weiss a3d847c3bd
Merge pull request #151902 from primeos/sway
sway: 1.6.1 -> 1.7
2022-01-23 21:46:19 +01:00
Michael Weiss 2e719d1cda
sway: 1.6.1 -> 1.7
Release notes: https://github.com/swaywm/sway/releases/tag/1.7

Notable (backward incompatible) changes:
- The default terminal changed from Alacritty to foot

Known issues:
- `swaynag` will crash when Sway 1.6.1 is still running while the Nix
  package (and thus `swaynag`) is already updated to version 1.7.
- The experimental Ozone/Wayland support of Electron apps will be broken
  for a while. Electron version 17 should work but the Chromium fixes
  haven't yet been backported to Electron version 16.

NixOS module: programs.sway.extraPackages: The "alacritty" package was
replaced with "foot".

VM test: We switched from the OpenGL ES 2.0 renderer to Pixman. The
terminal was also changed to foot but Alacritty is still used for the
XWayland test (since foot doesn't support X11).

Co-authored-by: Patrick Hilhorst <git@hilhorst.be>
2022-01-23 19:21:37 +01:00
Michael Weiss 3f9ced9a62
swayidle: 1.7 -> 1.7.1 2022-01-15 18:37:26 +01:00
Rick van Schijndel a7b0ed4c10 sway: support cross-compilation 2021-12-22 20:01:44 +01:00
Patrick Hilhorst 5a14b59cd7
Merge pull request #122995 from primeos/sway-install-default-wallpaper 2021-11-21 21:57:49 +01:00
Patrick Hilhorst 595ecd2ceb
sway: inherit tests from unwrapped package 2021-11-01 15:50:27 +01:00
Maximilian Bosch 2921a9a7d3
Merge pull request #142337 from SuperSamus/swaylock-fancy
swaylock-fancy: 2020-02-22 -> 2021-10-11
2021-10-20 22:19:14 +02:00
Martino Fontana 80b0ad667f swaylock-fancy: 2020-02-22 -> 2021-10-11 2021-10-20 13:09:57 +02:00
Yureka 7141eb9c57 sway: make xwayland optional 2021-10-20 11:37:04 +02:00
Rick van Schijndel f280586090 swaybg: support cross-compilation 2021-08-19 21:53:35 +02:00
Michael Weiss 4c56464099
swayidle: 1.6 -> 1.7 2021-08-17 12:15:03 +02:00
github-actions[bot] c0cb54f9ee
Merge master into staging-next 2021-07-19 18:01:10 +00:00
Michael Weiss 88d3e7cf76
swaybg: 1.0 -> 1.1 2021-07-19 14:39:48 +02:00
Michael Weiss f7997354b7
wayland-scanner: use for nativeBuildInputs
This makes things more explicit (and less confusing) but only touches
the packages that I maintain.
2021-07-03 17:56:23 +02:00
Rick van Schijndel 7a6419186c
swaylock: support cross-compilation 2021-07-03 11:22:33 +02:00
Rick van Schijndel cb5289c8ad
swayidle: support cross-compilation 2021-07-03 11:21:57 +02:00
Robert Schütz c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
Michael Weiss 73d7f08b4d
sway: 1.6 -> 1.6.1
Since wlroots 0.14 setting WLR_RENDERER_ALLOW_SOFTWARE=1 to allow
software rendering is now enforced [0].

[0]: https://github.com/swaywm/wlroots/pull/2810
2021-06-24 22:59:06 +02:00
Rick van Schijndel 4410856be7 swaybg: fix cross-compilation by adding wayland-scanner 2021-06-15 08:20:50 +02:00
Michael Weiss 83265a850d
sway: Install the wallpapers by default and use them on NixOS
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
2021-05-14 16:37:11 +02:00
zowoq 004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
Michael Weiss 60f2af5938
Merge pull request #122605 from primeos/nixos-sway-extend-default-configuration
nixos/sway: Extend the default configuration for NixOS
2021-05-13 20:48:55 +02:00
github-actions[bot] 5c4cda9988
Merge staging-next into staging 2021-05-12 00:50:13 +00:00
Michael Weiss 9716bb8944
sway: Set XDG_CURRENT_DESKTOP=sway
This seems like a good idea in general and will at least make it easier
to get screen sharing to work (but still requires a proper NixOS
configuration including xdg-desktop-portal-wlr).

Note: It isn't necessary to set XDG_SESSION_TYPE=wayland as wlroots
already takes care of it (currently at least for the logind and libseat
session backends, the next wlroots release will require libseat):
4839664a92/backend/session/session.c (L80)
2021-05-11 21:19:45 +02:00
Michael Weiss 00e8e5b123
nixos/sway: Extend the default configuration for NixOS
The default config.in template contains
"include @sysconfdir@/sway/config.d/*" but we've dropped it to better
support non-NixOS (which seems like a mistake in retrospect).
This restores that behaviour and extends the default configuration via
nixos.conf to fix #119445.

Note: The security configurations (security.d) where dropped entirely
(but maybe they'll return).
2021-05-11 18:53:49 +02:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
Michael Weiss 957b7a476e
nixos/tests/sway: init
This adds a basic test for Sway. Because Sway is an important part of
the Wayland ecosystem, is stable, and has few dependencies this test
should also be suitable for testing core packages it depends on (e.g.
wayland, wayland-protocols, wlroots, xwayland, mesa, libglvnd, libdrm,
and soon libseat).

The test is modeled after the suggested way of using Sway, i.e. logging
in via a virtual console (tty1) and copying the configuration from
/etc/sway/config (we replace Mod4 (the GNU/Tux key - you've replaced
that evil logo, right? :D) with Mod1 (Alt key) because QEMU monitor's
sendkey command doesn't support the former).

The shell aliases are used to make the sendkey log output shorter.

Co-authored-by: Patrick Hilhorst <git@hilhorst.be>
2021-05-04 16:52:36 +02:00
Yurii Matsiuk 92f5c75e80
swaylock-effects: 1.6-2 -> 1.6-3 (#119869)
* swaylock-effects: 1.6-2 -> 1.6-3

* Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-19 21:09:33 +02:00
Patrick Hilhorst 91fad635f0
sway: 1.5.1 -> 1.6
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
2021-04-08 17:24:24 +02:00
SEbbaDK 0b5a056d82 swaywsr: init at 1.1.0 2021-04-05 18:10:50 +02:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Michael Weiss fdc1e37440
Merge pull request #109647 from deviant/remove-swaybg-from-path
sway: remove swaybg from path
2021-01-19 12:01:59 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
V 29b14dfd9b sway: remove swaybg from path
Avoids polluting the environment for sway's children.
2021-01-18 17:56:31 +01:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Michael Weiss 4c0972e8d7
sway: 1.5 -> 1.5.1
This is basically a no-op, apart from the version bump.
2020-11-10 21:08:58 +01:00
Bruno Bigras 327e84900f swaylock-effects: v1.6-1 -> v1.6-2 2020-11-09 11:48:49 +00:00
Michael Weiss db6b85391f
sway: Fix the build with wlroots 0.12.0
Sway 1.5 isn't affected by the breaking changes of wlroots 0.12.0 so we
can simply relax the version requirement.
2020-11-08 16:52:40 +01:00
Michael Weiss e0b6b0a6d1
Merge pull request #91433 from primeos/sway-1.5
Sway 1.5
2020-07-16 23:05:28 +02:00
Michael Weiss 81a214e62c
sway-contrib.grimshot: Reuse sway-unwrapped.src 2020-07-16 22:47:15 +02:00
Michael Weiss f1dd43404a
sway: 1.4 -> 1.5 2020-07-16 22:46:53 +02:00
gnxlxnxx edeca59a5f
swaylock-effects: v1.6-0 -> v1.6-1 2020-07-09 20:20:48 +02:00
Evils 1db748ef6a sway-contrib.inactive-windows-transparency: init
at sway-unwrapped.version
2020-06-11 07:37:37 +02:00