simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

sway: Use package from unstable

Browse source 
Sway 1.6 is in nixos-unstable, so I don’t have to apply the patch
manually.

This also addds the WAYLAND_DISPLAY variable to dbus, which is required
to show the GCR prompter GTK3 window. This only happened after the
upgrade, so I assume sway changed some things that necessitate this.
This commit is contained in:
Simon Bruder 2021-04-30 18:21:42 +02:00
parent 36da32ff33
commit 0ddb38e8f9
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
users/simon/modules/sway.nix
View file

@ -30,15 +30,8 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
enable = true; enable = true;
systemdIntegration = true; systemdIntegration = true;
# TODO: remove patch once sway > 1.5.1 is released and in nixpkgs # TODO: remove with 21.05
package = pkgs.sway.override { package = pkgs.unstable.sway;
sway-unwrapped = pkgs.sway-unwrapped.overrideAttrs (o: o // {
patches = lib.singleton (pkgs.fetchpatch {
url = "https://github.com/swaywm/sway/commit/33b64667ae0bfe9af752cb8c850b4f52b34660d2.patch";
sha256 = "05s0xhd4wn98insn0wynr359nq938dmc7aa9rmyn7ira78fw40w8";
});
});
};
config = { config = {
modifier = "Mod4"; modifier = "Mod4";
@ -215,6 +208,9 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
extraConfig = '' extraConfig = ''
# Cursor # Cursor
seat seat0 xcursor_theme Adwaita seat seat0 xcursor_theme Adwaita
# GCR prompter requires dbus to have wayland related variables
exec "dbus-update-activation-environment WAYLAND_DISPLAY"
''; '';
}; };