sway: switch back to shipping the nixpkgs-wayland version
This commit is contained in:
@@ -1146,6 +1146,8 @@ in
|
||||
'';
|
||||
});
|
||||
|
||||
swaybg.sandbox.method = null; #< TODO: sandbox
|
||||
|
||||
swappy.sandbox.autodetectCliPaths = "existingFileOrParent";
|
||||
swappy.sandbox.whitelistWayland = true;
|
||||
|
||||
|
@@ -9,12 +9,10 @@ let
|
||||
# because then when things go wrong i have an actual shot at bisecting.
|
||||
# this has been useful as recently as 2024/08 when sway/wlroots updates straight up don't render output:
|
||||
# <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517>
|
||||
#
|
||||
# TODO(2025-01-19): nixpkgs-wayland.sway-unwrapped DOES NOT BUILD; re-enable this once it does.
|
||||
# inherit (pkgs.nixpkgs-wayland)
|
||||
# sway-unwrapped
|
||||
# wlroots
|
||||
# ;
|
||||
inherit (pkgs.nixpkgs-wayland)
|
||||
sway-unwrapped
|
||||
wlroots
|
||||
;
|
||||
};
|
||||
cfg = config.sane.programs.sway;
|
||||
enableXWayland = config.sane.programs.xwayland.enabled;
|
||||
@@ -45,7 +43,7 @@ let
|
||||
passthru.sway-unwrapped = configuredSway;
|
||||
};
|
||||
|
||||
wlroots = (pkgs'.wlroots_0_18.override {
|
||||
wlroots = (pkgs'.wlroots.override {
|
||||
# wlroots seems to launch Xwayland itself, and i can't easily just do that myself externally.
|
||||
# so in order for the Xwayland it launches to be sandboxed, i need to patch the sandboxed version in here.
|
||||
xwayland = config.sane.programs.xwayland.package;
|
||||
@@ -179,6 +177,7 @@ in
|
||||
"seatd"
|
||||
# "splatmoji" # used by sway config
|
||||
"sway-contrib.grimshot" # used by sway config
|
||||
"swaybg" # required for setting the background
|
||||
"swayidle" # enable if you need it
|
||||
"swaynotificationcenter" # notification daemon
|
||||
"switchboard" # network/bluetooth/sound control panel
|
||||
|
Reference in New Issue
Block a user