squash

bar/modules/bar.py

@@ -8,18 +8,19 @@ from bar.modules.player import Player
 from bar.modules.vinyl import VinylButton
 from fabric.widgets.wayland import WaylandWindow as Window
 from fabric.system_tray.widgets import SystemTray
-from fabric.river.widgets import (
-    RiverWorkspaces,
-    RiverWorkspaceButton,
-    RiverActiveWindow,
-    get_river_connection,
-)
+
 from fabric.utils import (
     invoke_repeater,
 )
 from fabric.widgets.circularprogressbar import CircularProgressBar
 
 from bar.config import VINYL
+from bar.services.river.widgets import (
+    RiverWorkspaces,
+    RiverWorkspaceButton,
+    RiverActiveWindow,
+    get_river_connection,
+)
 
 
 class StatusBar(Window):
@@ -42,8 +43,6 @@ class StatusBar(Window):
         )
         if river_service:
             self.river = river_service
-        else:
-            self.river = get_river_connection()
 
         self.workspaces = RiverWorkspaces(
             display,
@@ -56,6 +55,7 @@ class StatusBar(Window):
         self.system_tray = tray
 
         self.active_window = RiverActiveWindow(
+            river_service=self.river,
             name="active-window",
             max_length=50,
             style="color: #ffffff; font-size: 14px; font-weight: bold;",