diff --git a/nwg_panel/main.py b/nwg_panel/main.py index 9d52c50..5cea821 100644 --- a/nwg_panel/main.py +++ b/nwg_panel/main.py @@ -158,8 +158,12 @@ def restart(): def hypr_watcher(): import socket + # /tmp/hypr moved to $XDG_RUNTIME_DIR/hypr in #5788 + hypr_dir = f"{os.getenv("XDG_RUNTIME_DIR")}/hypr" if os.path.isdir( + f"{os.getenv("XDG_RUNTIME_DIR")}/hypr") else "/tmp/hypr" + client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - client.connect("/tmp/hypr/{}/.socket2.sock".format(his)) + client.connect(f"{hypr_dir}/{his}/.socket2.sock") global last_client_addr, last_client_title client_addr, client_title = None, None diff --git a/nwg_panel/processes.py b/nwg_panel/processes.py index 0c9b66b..83edbb9 100644 --- a/nwg_panel/processes.py +++ b/nwg_panel/processes.py @@ -2,7 +2,7 @@ """ nwg-shell helper script to preview system processes -Copyright (c) 2023 Piotr Miller +Copyright (c) 2023-2024 Piotr Miller e-mail: nwg.piotr@gmail.com GitHub: https://github.com/nwg-piotr/nwg-panel Project: https://nwg-piotr.github.io/nwg-shell @@ -45,8 +45,12 @@ btn_pid, btn_ppid, btn_owner, btn_cpu, btn_mem, btn_name = None, None, None, Non def hyprctl(cmd): + # /tmp/hypr moved to $XDG_RUNTIME_DIR/hypr in #5788 + hypr_dir = f"{os.getenv("XDG_RUNTIME_DIR")}/hypr" if os.path.isdir( + f"{os.getenv("XDG_RUNTIME_DIR")}/hypr") else "/tmp/hypr" + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - s.connect("/tmp/hypr/{}/.socket.sock".format(os.getenv("HYPRLAND_INSTANCE_SIGNATURE"))) + s.connect(f"{hypr_dir}/{os.getenv("HYPRLAND_INSTANCE_SIGNATURE")}/.socket.sock") s.send(cmd.encode("utf-8")) output = s.recv(20480).decode('utf-8') diff --git a/nwg_panel/tools.py b/nwg_panel/tools.py index 98b5fbd..9380e8e 100644 --- a/nwg_panel/tools.py +++ b/nwg_panel/tools.py @@ -820,9 +820,13 @@ def load_shell_data(): def hyprctl(cmd, buf_size=2048): + # /tmp/hypr moved to $XDG_RUNTIME_DIR/hypr in #5788 + hypr_dir = f"{os.getenv("XDG_RUNTIME_DIR")}/hypr" if os.path.isdir( + f"{os.getenv("XDG_RUNTIME_DIR")}/hypr") else "/tmp/hypr" + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) try: - s.connect("/tmp/hypr/{}/.socket.sock".format(os.getenv("HYPRLAND_INSTANCE_SIGNATURE"))) + s.connect(f"{hypr_dir}/{os.getenv("HYPRLAND_INSTANCE_SIGNATURE")}/.socket.sock") s.send(cmd.encode("utf-8")) output = b""