Post refactoring fixes 2/?

Commons/Settings.qml

@@ -75,7 +75,6 @@ Singleton {
         property bool showActiveWindow: true
         property bool showSystemInfo: false
         property bool showMedia: false
-        property bool showTaskbar: false
         property list<string> monitors: []
       }
 

Modules/Bar/ActiveWindow.qml

@@ -5,6 +5,7 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 
+
 Row {
   id: layout
   anchors.verticalCenter: parent.verticalCenter
@@ -27,7 +28,7 @@ Row {
 
   // Update text when window changes
   Connections {
-    target: typeof Niri !== "undefined" ? Niri : null
+    target: typeof NiriService !== "undefined" ? NiriService : null
     function onFocusedWindowIndexChanged() {
       // Check if window actually changed
       if (NiriService.focusedWindowIndex !== lastWindowIndex) {
@@ -92,13 +93,13 @@ Row {
 
   function getDisplayText() {
     // Check if Niri service is available
-    if (typeof Niri === "undefined") {
+    if (typeof NiriService === "undefined") {
       return ""
     }
 
     // Get the focused window data
-    const focusedWindow = NiriService.focusedWindowIndex >= 0
+    const focusedWindow = NiriService.focusedWindowIndex >= 0 && NiriService.focusedWindowIndex
-                        && NiriService.focusedWindowIndex < NiriService.windows.length ? NiriService.windows[NiriService.focusedWindowIndex] : null
+                        < NiriService.windows.length ? NiriService.windows[NiriService.focusedWindowIndex] : null
 
     if (!focusedWindow) {
       return ""

Modules/Bar/WiFiMenu.qml

@@ -294,8 +294,8 @@ NLoader {
                         }
 
                         NText {
-                          visible: NetworkService.connectStatusSsid === modelData.ssid && NetworkService.connectStatus === "error"
+                          visible: NetworkService.connectStatusSsid === modelData.ssid
-                                   && network.connectError.length > 0
+                                   && NetworkService.connectStatus === "error" && network.connectError.length > 0
                           text: NetworkService.connectError
                           color: Colors.mError
                           font.pointSize: Style.fontSizeSmall * scaling

Modules/SettingsPanel/Tabs/BarTab.qml

@@ -58,15 +58,6 @@ ColumnLayout {
           }
         }
 
-        NToggle {
-          label: "Show Taskbar"
-          description: "Display a taskbar showing currently open windows"
-          value: Settings.data.bar.showTaskbar
-          onToggled: function (newValue) {
-            Settings.data.bar.showTaskbar = newValue
-          }
-        }
-
         NToggle {
           label: "Show Media"
           description: "Display media controls and information"

Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml

@@ -107,7 +107,8 @@ Item {
         Item {
           Layout.fillWidth: true
           Layout.preferredHeight: {
-            return Math.ceil(WallpapersService.wallpaperList.length / wallpaperGridView.columns) * wallpaperGridView.cellHeight
+            return Math.ceil(
+                  WallpapersService.wallpaperList.length / wallpaperGridView.columns) * wallpaperGridView.cellHeight
           }
 
           GridView {

Modules/SidePanel/Cards/WeatherCard.qml

@@ -27,7 +27,8 @@ NBox {
     RowLayout {
       spacing: Style.marginSmall * scaling
       NText {
-        text: weatherReady ? LocationService.weatherSymbolFromCode(LocationService.data.weather.current_weather.weathercode) : ""
+        text: weatherReady ? LocationService.weatherSymbolFromCode(
+                               LocationService.data.weather.current_weather.weathercode) : ""
         font.family: "Material Symbols Outlined"
         font.pointSize: Style.fontSizeXXL * 1.5 * scaling
         color: Colors.mPrimary

Services/ColorSchemesService.qml

@@ -4,6 +4,7 @@ import QtQuick
 import Qt.labs.folderlistmodel
 import Quickshell
 import Quickshell.Io
+import qs.Commons
 
 Singleton {
   id: root

Services/WorkspacesService.qml

@@ -34,7 +34,7 @@ Singleton {
 
       }
 
-      if (typeof Niri !== "undefined") {
+      if (typeof NiriService !== "undefined") {
         isHyprland = false
         isNiri = true
         initNiri()

shell.qml

@@ -11,6 +11,7 @@ import qs.Modules.Bar
 import qs.Modules.Calendar
 import qs.Modules.Demo
 import qs.Modules.Dock
+import qs.Modules.IPC
 import qs.Modules.LockScreen
 import qs.Modules.Notification
 import qs.Modules.SettingsPanel