test_version

eww/scripts/workspaces.py

@@ -1,10 +1,9 @@
+#!/usr/bin/env python3
+
+import asyncio
 import json
-import subprocess
 import os
 import sys
-import socket
-import threading
-import time
 
 class UnifiedWorkspaceManager:
     def __init__(self):
@@ -16,11 +15,8 @@ class UnifiedWorkspaceManager:
         self.monitors_cache = {}
         
         self.load_icon_configuration()
-        self.clients_refresh()
-        self.monitors_refresh()
 
     def load_icon_configuration(self):
-        # тянем иконки из конфига
         config_path = os.path.join(self.script_directory, "workspaces_map.json")
         try:
             with open(config_path, 'r') as file:
@@ -28,53 +24,59 @@ class UnifiedWorkspaceManager:
         except:
             self.icon_map = {"default": "", "no-icon": ""}
 
-    def monitors_refresh(self):
+    async def monitors_refresh(self):
-        # обновляем инфу по мониторам
         try:
-            raw = subprocess.check_output(["hyprctl", "-j", "monitors"], stderr=subprocess.DEVNULL)
+            proc = await asyncio.create_subprocess_exec(
-            monitors = json.loads(raw)
+                "hyprctl", "-j", "monitors",
-            self.monitors_cache = {
+                stdout=asyncio.subprocess.PIPE,
-                m['name']: {
+                stderr=asyncio.subprocess.DEVNULL
-                    "id": m['id'],
+            )
-                    "active_workspace_id": m['activeWorkspace']['id'],
+            stdout, _ = await proc.communicate()
-                    "focused": m.get('focused', False)
+            if proc.returncode == 0:
-                } for m in monitors
+                monitors = json.loads(stdout.decode())
-            }
+                self.monitors_cache = {
+                    m['name']: {
+                        "id": m['id'],
+                        "active_workspace_id": m['activeWorkspace']['id'],
+                        "focused": m.get('focused', False)
+                    } for m in monitors
+                }
         except:
             self.monitors_cache = {}
 
-    def clients_refresh(self):
+    async def clients_refresh(self):
-        # полный сброс и пересборка кэша окон
         try:
-            raw = subprocess.check_output(["hyprctl", "-j", "clients"], stderr=subprocess.DEVNULL)
+            proc = await asyncio.create_subprocess_exec(
-            clients = json.loads(raw)
+                "hyprctl", "-j", "clients",
-            self.clients_cache = {
+                stdout=asyncio.subprocess.PIPE,
-                c['address'].strip().replace('0x', ''): {
+                stderr=asyncio.subprocess.DEVNULL
-                    "class": c['class'],
+            )
-                    "workspace_id": c['workspace']['id'],
+            stdout, _ = await proc.communicate()
-                    "monitor_id": c['monitor']
+            if proc.returncode == 0:
-                } for c in clients
+                clients = json.loads(stdout.decode())
-            }
+                self.clients_cache = {
+                    c['address'].strip().replace('0x', ''): {
+                        "class": c['class'],
+                        "workspace_id": c['workspace']['id'],
+                        "monitor_id": c['monitor']
+                    } for c in clients
+                }
         except:
             self.clients_cache = {}
 
     def get_current_state_json(self):
-        # собираем финальный json
         try:
             output = {}
-
             for mon_name, mon_data in self.monitors_cache.items():
                 m_id = mon_data["id"]
                 active_id = mon_data["active_workspace_id"]
                 focused = mon_data["focused"]
 
-                # готовим 10 слотов
                 workspaces = {
                     str(i): {"exists": False, "active": False, "focused": False, "urgent": False, "icons": []} 
                     for i in range(1, 11)
                 }
                 
-                # раскидываем окна по воркспейсам
                 for addr, client in self.clients_cache.items():
                     if client['monitor_id'] == m_id:
                         ws_id = str(client['workspace_id'])
@@ -88,12 +90,10 @@ class UnifiedWorkspaceManager:
                             if icon not in slot["icons"]:
                                 slot["icons"].append(icon)
 
-                # помечаем текущий активный воркспейс
                 curr_ws = str(active_id)
                 if curr_ws in workspaces:
                     workspaces[curr_ws].update({"active": True, "focused": focused, "exists": True})
 
-                # рисуем no-icon
                 for ws in workspaces.values():
                     if ws["exists"] and not ws["icons"]:
                         ws["icons"] = [self.icon_map.get("no-icon", "")]
@@ -105,109 +105,105 @@ class UnifiedWorkspaceManager:
             return "{}"
 
     def push_update(self):
-        # отдаём json в stdout при изменении
         current = self.get_current_state_json()
         if current != self.last_sent_json:
             self.last_sent_json = current
             sys.stdout.write(current + '\n')
             sys.stdout.flush()
 
-    def update_client(self, window_address):
+    async def update_client(self, window_address):
-        # обновляем окно
         try:
             clean_addr = window_address.replace('0x', '')
             search_addr = f"0x{clean_addr}"
             
-            raw = subprocess.check_output(["hyprctl", "-j", "clients"], stderr=subprocess.DEVNULL)
+            proc = await asyncio.create_subprocess_exec(
-            clients = json.loads(raw)
+                "hyprctl", "-j", "clients",
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.DEVNULL
+            )
+            stdout, _ = await proc.communicate()
             
-            target = next((c for c in clients if c['address'] == search_addr), None)
+            if proc.returncode == 0:
+                clients = json.loads(stdout.decode())
+                target = next((c for c in clients if c['address'] == search_addr), None)
                 
-            if target:
+                if target:
-                self.clients_cache[clean_addr] = {
+                    self.clients_cache[clean_addr] = {
-                    "class": target.get('class', 'unknown'),
+                        "class": target.get('class', 'unknown'),
-                    "workspace_id": target['workspace']['id'],
+                        "workspace_id": target['workspace']['id'],
-                    "monitor_id": target['monitor']
+                        "monitor_id": target['monitor']
-                }
+                    }
-            else:
+                    return
-                self.clients_cache.pop(clean_addr, None)
             
+            self.clients_cache.pop(clean_addr, None)
         except:
-            # если что-то отвалилось, то просто пересобираем всё
+            await self.clients_refresh()
-            self.clients_refresh()
 
-    def run(self):
+    async def run(self):
+        await self.clients_refresh()
+        await self.monitors_refresh()
         self.push_update()
 
-        def event_socket_listener():
+        signature = os.environ.get('HYPRLAND_INSTANCE_SIGNATURE')
-            # слушаем сокет хайпера
+        socket_path = f"/run/user/{os.getuid()}/hypr/{signature}/.socket2.sock"
-            signature = os.environ.get('HYPRLAND_INSTANCE_SIGNATURE')
-            socket_path = f"/run/user/{os.getuid()}/hypr/{signature}/.socket2.sock"
 
-            while True:
+        while True:
-                try:
+            try:
-                    with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+                reader, writer = await asyncio.open_unix_connection(socket_path)
-                        sock.connect(socket_path)
-                        buf = ""
-                        while True:
-                            data = sock.recv(4096).decode('utf-8', errors='ignore')
-                            if not data: break
-                            buf += data
                 
-                            if '\n' in buf:
+                while True:
-                                lines = buf.split('\n')
+                    line_bytes = await reader.readline()
-                                buf = lines.pop()
+                    if not line_bytes:
+                        break
                     
-                                trigger = False
+                    line = line_bytes.decode('utf-8', errors='ignore').strip()
-                                for line in lines:
+                    if ">>" not in line:
-                                    if ">>" not in line: continue
+                        continue
-                                    event, args = line.split('>>')
                         
-                                    # ивенты с окнами
+                    event, args = line.split('>>')
-                                    if event in ["openwindow", "movewindow"]:
+                    trigger = False
-                                        addr = args.split(',')[0].replace('0x', '')
-                                        self.update_client(addr)
-                                        trigger = True
                     
-                                    elif event == "closewindow":
+                    if event in ["openwindow", "movewindow"]:
-                                        addr = args.replace('0x', '')
+                        addr = args.split(',')[0].replace('0x', '')
-                                        self.clients_cache.pop(addr, None)
+                        await self.update_client(addr)
-                                        self.urgent_window_addresses.discard(addr)
+                        trigger = True
-                                        trigger = True
                     
-                                    # ивенты с мониторами
+                    elif event == "closewindow":
-                                    elif event in ["workspace", "workspacev2", "monitoradded", "monitorremoved"]:
+                        addr = args.replace('0x', '')
-                                        self.monitors_refresh()
+                        self.clients_cache.pop(addr, None)
-                                        trigger = True
+                        self.urgent_window_addresses.discard(addr)
+                        trigger = True
 
-                                    elif event in ["focusedmon", "focusedmonv2"]:
+                    elif event in ["workspace", "workspacev2", "monitoradded", "monitorremoved"]:
-                                        mon_name = args.split(',')[0]
+                        await self.monitors_refresh()
-                                        for name in self.monitors_cache:
+                        trigger = True
-                                            self.monitors_cache[name]["focused"] = (name == mon_name)
-                                        trigger = True
 
-                                    # алерты
+                    elif event in ["focusedmon", "focusedmonv2"]:
-                                    elif event == "urgent":
+                        mon_name = args.split(',')[0]
-                                        self.urgent_window_addresses.add(args.replace('0x', ''))
+                        for name in self.monitors_cache:
-                                        trigger = True
+                            self.monitors_cache[name]["focused"] = (name == mon_name)
+                        trigger = True
 
-                                    elif event in ["activewindow", "activewindowv2"]:
+                    elif event == "urgent":
-                                        addr = args.split(',')[0].replace('0x', '')
+                        self.urgent_window_addresses.add(args.replace('0x', ''))
-                                        if addr in self.urgent_window_addresses:
+                        trigger = True
-                                            self.urgent_window_addresses.remove(addr)
-                                            trigger = True
                         
-                                if trigger:
+                    elif event in ["activewindow", "activewindowv2"]:
-                                    self.push_update()
+                        addr = args.split(',')[0].replace('0x', '')
-                except:
+                        if addr in self.urgent_window_addresses:
-                    time.sleep(2) # реконнект, если хайпер отвалился
+                            self.urgent_window_addresses.remove(addr)
+                            trigger = True
 
-        # слушаем поток в фоне
+                    if trigger:
-        threading.Thread(target=event_socket_listener, daemon=True).start()
+                        self.push_update()
                         
-        try:
+            except (asyncio.CancelledError, KeyboardInterrupt):
-            while True: time.sleep(100)
+                break
-        except KeyboardInterrupt: sys.exit(0)
+            except Exception as e:
+                await asyncio.sleep(2)
 
 if __name__ == "__main__":
-    UnifiedWorkspaceManager().run()
+    try:
+        asyncio.run(UnifiedWorkspaceManager().run())
+    except KeyboardInterrupt:
+        sys.exit(0)

eww/scripts/workspaces_map.json

@@ -4,7 +4,7 @@
   "firefox": "",
   "code-oss": "󰨞",
   "org.telegram.desktop": "",
-  "kitty": "",
+  "foot": "",
   "steam": "",
   "Spotify": "",
   "discord": "󰙯",

hypr/config/exec.conf

@@ -6,3 +6,4 @@ exec-once = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 exec-once = eww daemon && sleep 1 && eww open-many bar_0 bar_1 wallpaper_0 wallpaper_1
 exec-once = hypridle --grace 15
+exec-once = python3 /home/pyrschtjag/Documents/.ntfy-notify/ntfy-notify.py

hypr/config/programs.conf

@@ -1,4 +1,4 @@
 $mainMod = SUPER
-$terminal = kitty
+$terminal = foot
-$fileManager = kitty mc
+//$fileManager = kitty mc
 $menu = rofi -show drun

hypr/hyprland.conf

@@ -6,7 +6,7 @@ source = ~/.config/hypr/config/env.conf
 source = ~/.config/hypr/config/general.conf
 source = ~/.config/hypr/config/decoration.conf
 source = ~/.config/hypr/config/animations.conf
-source = ~/.config/hypr/config/dwindle.conf
+//source = ~/.config/hypr/config/dwindle.conf
 source = ~/.config/hypr/config/master.conf
 source = ~/.config/hypr/config/misc.conf
 source = ~/.config/hypr/config/input.conf