Commit graph

83 commits

Author SHA1 Message Date
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
Evils 40c3a8eead sway-contrib.grimshot: init at 2020-05-08 2020-06-11 07:37:37 +02:00
Michael Weiss 023e11ae34
swaylock: Add a short note about the required PAM module
See #89019, hopefully this helps a bit.
2020-05-28 00:27:19 +02:00
Ely cdfad5ad84
sway: Fix the GTK wrapper (#86960)
Fixes #67704.
2020-05-08 11:45:27 +02:00
Michael Weiss 1a047c4a8e
sway: Make it possible to use exec in extraSessionCommands
This is useful for use-cases like this (logging to journald):
```
programs.sway.extraSessionCommands = ''
  if [ -z "$_SWAY_DID_SYSTEMD_CAT" ]; then
    export _SWAY_DID_SYSTEMD_CAT=1
    exec ${config.systemd.package}/bin/systemd-cat -t sway "$0" "$@"
  fi
  # ... (potentially also another exec)
'';
```

Without this change the rest of the extraSessionCommands won't be
executed after the exec since the whole extraSessionCommands block would
be skipped during the re-execution (_SWAY_WRAPPER_ALREADY_EXECUTED is
already set).
2020-04-22 17:09:20 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
gnxlxnxx 8e6a74e957 swaylock-effects: init at v1.6-0 2020-04-03 13:02:28 +02:00
Maximilian Bosch d5db5d12aa
swaylock-fancy: 2019-03-31 -> 2020-02-22 2020-02-25 19:56:25 +01:00
Michael Weiss 2a2f4ff938
swayidle: 1.5 -> 1.6
Changelog: https://github.com/swaywm/swayidle/releases/tag/1.6
2020-01-22 21:38:01 +01:00
Michael Weiss 6288a57e39
swaylock: 1.4 -> 1.5
Changelog: https://github.com/swaywm/swaylock/releases/tag/1.5
2020-01-22 21:38:01 +01:00
Michael Weiss beca0911f4
sway: 1.2 -> 1.4
Changelog: https://github.com/swaywm/sway/releases/tag/1.4
2020-01-22 21:36:32 +01:00
Maximilian Bosch ec2ed2d316
swaylock-fancy: fix src 2020-01-14 10:17:52 +01:00
Michael Weiss 0608d78f3c
Merge pull request #76437 from gnidorah/sway
nixos/sway: add programs.sway.extraOptions
2020-01-11 12:16:34 +01:00
gnidorah ad8a430a3a
nixos/sway: add programs.sway.extraOptions 2020-01-09 22:25:01 +01:00
Maximilian Bosch 4c45878a30
swaylock-fancy-unstable: init at 2019-03-31
Port of `i3lock-fancy` to `swaylock`.
Closes #77284
2020-01-09 02:24:58 +01:00
Maximilian Bosch 9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Elyhaka d467c59825
sway: refactor with a wrapper 2019-12-21 21:17:21 +01:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Michael Weiss d861196c61
sway: 1.1.1 -> 1.2 2019-08-27 11:32:15 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Michael Weiss 48067b5c97
swayidle: 1.4 -> 1.5 2019-07-11 22:23:16 +02:00
Michael Weiss 42559f1cf1
swayidle: 1.3 -> 1.4 2019-07-10 20:57:48 +02:00
Patrick Hilhorst e7be5691ba
sway: manually update version in meson.build
This wasn't done upstream. Adapted from:

5956e993dd/default.nix (L32-L34)

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
2019-06-04 19:32:14 +02:00
Patrick Hilhorst 9ab064b8d9
sway: 1.0 -> 1.1.1 2019-06-04 16:12:42 +02:00
Michael Weiss 65f07c097d
swaybg: init at 1.0 2019-05-03 22:30:41 +02:00
Michael Weiss 1f1e075fb1
swayidle: 1.2 -> 1.3 2019-05-03 22:16:21 +02:00
Michael Weiss d43ea14abb
swaylock: 1.3 -> 1.4 2019-05-03 22:16:21 +02:00
Michael Weiss 15010f0436
sway: Read the configuration from /etc before /nix/store (#60319)
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
2019-04-27 22:38:18 +02:00
Michael Weiss 578fe3f5a0
nixos/sway: Improve the module and adapt it to NixOS
This commit contains the following changes:
- nixos/sway: Remove the beta references
- sway: Drop buildDocs
- nixos/sway: Improve the documentation
- sway,nixos/sway: Adapt Sway to NixOS
  - Copy the default configuration file to /etc/sway/config (Sway will
    still load the identical file from the Nix store but this makes it
    easier to copy the default configuration file).
  - This will also remove all references to the Nix store from the
    default configuration file as they will eventually be garbage
    collected which is a problem if the user copies it.
  - I've also decided to drop the default wallpaper (alternatively we
    could copy it to a fixed location).
- nixos/sway: Drop the package option
2019-03-13 11:37:11 +01:00
Michael Weiss 45004c6f63
sway: Switch to 1.0
This is the result of executing:
git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix

And removing sway-beta from the following files:
pkgs/top-level/all-packages.nix
nixos/modules/module-list.nix
2019-03-12 22:29:39 +01:00
Michael Weiss 1240834176
sway-beta: Use the upstream patch to fix the build failure 2019-03-11 18:51:26 +01:00
Michael Weiss eb2a26f5c6
sway-beta: 1.0-rc5 -> 1.0 2019-03-11 17:02:25 +01:00