Commit graph

9 commits

Author SHA1 Message Date
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
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
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
V 29b14dfd9b sway: remove swaybg from path
Avoids polluting the environment for sway's children.
2021-01-18 17:56:31 +01: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
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