mirror of
https://github.com/nix-community/home-manager.git
synced 2026-01-11 17:39:37 +08:00
i3-sway: only return current user's socket (#2914)
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:
@@ -434,8 +434,8 @@ in {
|
||||
xdg.configFile."sway/config" = {
|
||||
source = configFile;
|
||||
onChange = ''
|
||||
swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway || true).sock
|
||||
if [ -S $swaySocket ]; then
|
||||
swaySocket="''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep --uid $UID -x sway || true).sock"
|
||||
if [ -S "$swaySocket" ]; then
|
||||
${pkgs.sway}/bin/swaymsg -s $swaySocket reload
|
||||
fi
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user