Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

i3-sway: only return current user's socket (#2914)

Browse source 
Constrain the pgrep command to only return results for the current user.
Additionally, quote the socket variables to prevent splitting.

Previously, if multiple users on a system were running `sway`, the
`pgrep` used in finding `swaySocket` would return multiple results. As a
result, reloads of sway would fail.

Fixes #2912.
This commit is contained in:
Nathan Typanski 2022-04-24 17:38:50 -04:00 committed by GitHub
parent 65a32578d9
commit 6f025b3825
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/services/window-managers/i3-sway/sway.nix
View file

@ -434,8 +434,8 @@ in {
xdg.configFile."sway/config" = { xdg.configFile."sway/config" = {
source = configFile; source = configFile;
onChange = '' onChange = ''
swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway || true).sock swaySocket="''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep --uid $UID -x sway || true).sock"
if [ -S $swaySocket ]; then if [ -S "$swaySocket" ]; then
${pkgs.sway}/bin/swaymsg -s $swaySocket reload ${pkgs.sway}/bin/swaymsg -s $swaySocket reload
fi fi
''; '';