Commit graph

34 commits

Author SHA1 Message Date
Martin Weinelt 09798ce569
nixos/sway: enable polkit
Without polkit the tests would stop working.
2022-01-27 01:45:45 +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
Patrick Hilhorst 5a14b59cd7
Merge pull request #122995 from primeos/sway-install-default-wallpaper 2021-11-21 21:57:49 +01:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Michael Weiss eb8a694d92
nixos/sway: Drop rxvt-unicode from the extraPackages default
Upstream switched to Alacritty for the default configuration.
2021-06-23 17:35:20 +02:00
Sandro 700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Michael Weiss a542827c9b
nixos/sway: Update the module documentation
Most programs already run natively under Wayland so extraSessionCommands
isn't as important anymore. XWayland is already covered by
"programs.xwayland.enable = mkDefault true;" in the module.
2021-05-15 20:30:53 +02:00
Michael Weiss 3f31c0edef
sway: Simplify screen sharing
This should make it easier to get started.
The xdg-desktop-portal backend for wlroots is required and one needs to
"make sure WAYLAND_DISPLAY and XDG_CURRENT_DESKTOP are imported into
D-Bus." [0]

[0]: efcbcb60aa/README.md (running)
2021-05-14 22:42:19 +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
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
Sandro Jäckel ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
kat 5be8697a33
nixos/sway: further parity between extraPackages default and defaultText
Co-authored-by: Robert Schütz <rschuetz17@gmail.com>
2021-03-17 15:36:31 +00:00
kat witch 102137e359
nixos/sway: fixed defaultText 2021-03-17 13:49:19 +00:00
Emilio Perez 52f028f2d9 nixos/xwayland: add new module and allow configuring a default font path
- Add option `programs.xwayland.defaultFontPath`
- Modify sway to enable Xwayland
2020-10-04 14:56:30 +01:00
rnhmjoj ceb35dac58
nixos/sway: use new package name for rxvt-unicode 2020-02-13 09:36:35 +01:00
Michael Weiss e99b32d27f
nixos/sway: Install the new default terminal emulator
The default changed in Sway 1.3 from rxvt_unicode to alacritty. For
backward compatibility we'll install both terminal emulators by default.
2020-01-22 21:38:01 +01:00
gnidorah ad8a430a3a
nixos/sway: add programs.sway.extraOptions 2020-01-09 22:25:01 +01:00
Elyhaka d467c59825
sway: refactor with a wrapper 2019-12-21 21:17:21 +01:00
Tor Hedin Brønner dd7144b860
nixos/sessionPackages: provide session names in passthru
We want access to the valid session names at evaluation time.
2019-12-15 04:16:18 +01:00
Tor Hedin Brønner d362df6682
nixos/display-manager: extraSessionFilePackages -> sessionPackages 2019-12-15 04:14:56 +01:00
Michael Weiss ca9788d4de
nixos/sway: Enable the display manager integration
If no display manager is enabled this will not make any difference, but
if a Wayland compatible display manager like SDDM is enabled, a session
for Sway will be available. Therefore it does make sense to enable this
by default.

This adds the display manager integration mentioned in #57602.
2019-12-09 14:18:03 +01:00
Maximilian Bosch 713fda2eb5
nixos/sway: install swaybg by default 2019-09-18 21:50:18 +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
gnidorah d15425f816 nixos/sway: Improve the wrapper
Port a change by @primeos from sway-beta module to sway module.

https://github.com/NixOS/nixpkgs/pull/51316
2019-01-01 11:21:15 +03:00
Florian Klink fff5923686 nixos/modules: users.(extraUsers|extraGroup->users|group) 2018-06-30 03:02:58 +02:00
Michael Weiss 4be298bf6d nixos/sway: Extend the descriptions and examples
This'll hopefully make it a bit easier to get started with Sway and make
some things about the module more obvious.
2017-12-25 00:15:06 +01:00
gnidorah b9851a975e Make less known wayland compositors usable (#32285)
* bemenu: init at 2017-02-14

* velox: 2015-11-03 -> 2017-07-04

* orbment, velox: don't expose subprojects

the development of orbment and velox got stuck
their subprojects (bemenu, dmenu-wayland, st-wayland) don't work correctly outside of parent projects
so hide them to not confuse people
swc and wld libraries are unpopular and unlike wlc are not used by anything except velox

* pythonPackages.pydbus: init at 0.6.0

* way-cooler: 0.5.2 -> 0.6.2

* nixos/way-cooler: add module

* dconf module: use for wayland

non-invasive approach for #31293
see discussion at #32210

* sway: embed LD_LIBRARY_PATH for #32755

* way-cooler: switch from buildRustPackage to buildRustCrate #31150
2017-12-21 16:16:19 +00:00
gnidorah d0bcade807 sway module: passthrough sway binary when needed 2017-11-07 22:02:22 +03:00
gnidorah 194d7852f7 sway module: setcap binary, not wrapper 2017-11-03 21:00:46 +03:00
gnidorah 130c61f8f2 sway module: better defaults 2017-10-25 20:53:44 +01:00
gnidorah e18afa63b7 sway module: more options 2017-10-25 21:52:02 +03:00
Joerg Thalheim f8085cb1dd nixos/sway: add module 2017-10-19 10:46:31 -04:00