colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sway: switch back to shipping the nixpkgs-wayland version

Browse Source
This commit is contained in:
Colin
2025-06-10 16:58:10 +00:00
parent 81201a97ba
commit ff667bc576
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/assorted.nix
View File

@@ -1146,6 +1146,8 @@ in
''; '';
}); });
swaybg.sandbox.method = null; #< TODO: sandbox
swappy.sandbox.autodetectCliPaths = "existingFileOrParent"; swappy.sandbox.autodetectCliPaths = "existingFileOrParent";
swappy.sandbox.whitelistWayland = true; swappy.sandbox.whitelistWayland = true;

13
hosts/common/programs/sway/default.nix
View File

@@ -9,12 +9,10 @@ let
# because then when things go wrong i have an actual shot at bisecting. # 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: # 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> # <https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715#note_2523517>
# inherit (pkgs.nixpkgs-wayland)
# TODO(2025-01-19): nixpkgs-wayland.sway-unwrapped DOES NOT BUILD; re-enable this once it does. sway-unwrapped
# inherit (pkgs.nixpkgs-wayland) wlroots
# sway-unwrapped ;
# wlroots
# ;
}; };
cfg = config.sane.programs.sway; cfg = config.sane.programs.sway;
enableXWayland = config.sane.programs.xwayland.enabled; enableXWayland = config.sane.programs.xwayland.enabled;
@@ -45,7 +43,7 @@ let
passthru.sway-unwrapped = configuredSway; 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. # 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. # 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; xwayland = config.sane.programs.xwayland.package;
@@ -179,6 +177,7 @@ in
"seatd" "seatd"
# "splatmoji" # used by sway config # "splatmoji" # used by sway config
"sway-contrib.grimshot" # used by sway config "sway-contrib.grimshot" # used by sway config
"swaybg" # required for setting the background
"swayidle" # enable if you need it "swayidle" # enable if you need it
"swaynotificationcenter" # notification daemon "swaynotificationcenter" # notification daemon
"switchboard" # network/bluetooth/sound control panel "switchboard" # network/bluetooth/sound control panel