aboutsummaryrefslogtreecommitdiff
path: root/modules/services/window-managers
diff options
context:
space:
mode:
authorCole Helbling <cole.e.helbling@outlook.com>2020-03-12 23:17:36 -0700
committerRobert Helgesson <robert@rycee.net>2020-03-21 18:00:26 +0100
commit8571e568e05e3abcc676c86fa06ea13f6c09f9a4 (patch)
tree56f6f3a01e83698cfd955542d6e5306870065438 /modules/services/window-managers
parentfe145b12cd6bcf111f2dd3a36124a3dbce80d9b3 (diff)
sway: fix onChange when defunct sockets exist
Fixes `..../generation/activate: line 181: [: too many arguments` when, for whatever reason, the user has multiple `sway-ipc` sockets. PR #1086
Diffstat (limited to 'modules/services/window-managers')
-rw-r--r--modules/services/window-managers/i3-sway/sway.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/services/window-managers/i3-sway/sway.nix b/modules/services/window-managers/i3-sway/sway.nix
index 31a94e46b35..314d9210bde 100644
--- a/modules/services/window-managers/i3-sway/sway.nix
+++ b/modules/services/window-managers/i3-sway/sway.nix
@@ -379,7 +379,7 @@ in {
xdg.configFile."sway/config" = {
source = configFile;
onChange = ''
- swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.*.sock
+ swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway).sock
if [ -S $swaySocket ]; then
echo "Reloading sway"
$DRY_RUN_CMD ${cfg.package}/bin/swaymsg -s $swaySocket reload