squash

bar/main.py

@@ -3,17 +3,18 @@ from loguru import logger
 from fabric import Application
 from fabric.system_tray.widgets import SystemTray
 from fabric.widgets.wayland import WaylandWindow as Window
-from fabric.river.widgets import (
-    get_river_connection,
-)
+
+
 from fabric.utils import (
     get_relative_path,
 )
 from .modules.bar import StatusBar
 from .modules.window_fuzzy import FuzzyWindowFinder
-
+from .services.river.widgets import get_river_connection
+from .services.wlr.event_loop import WaylandEventLoopService
 
 tray = SystemTray(name="system-tray", spacing=4)
+wayland_event_loop = WaylandEventLoopService()
 river = get_river_connection()
 
 dummy = Window(visible=False)
@@ -36,7 +37,12 @@ def spawn_bars():
     output_ids = sorted(outputs.keys())
 
     for i, output_id in enumerate(output_ids):
-        bar = StatusBar(display=output_id, tray=tray if i == 0 else None, monitor=i)
+        bar = StatusBar(
+            display=output_id,
+            tray=tray if i == 0 else None,
+            monitor=i,
+            river_service=river,
+        )
         bar_windows.append(bar)
 
     return False