rename bar module files and qmldir types to *Module

shell/modules/Bar.qml

@@ -109,11 +109,11 @@ PanelWindow {
             spacing: S.Theme.groupSpacing
 
             M.BarGroup {
-                M.Privacy {}
+                M.PrivacyModule {}
-                M.Clock {
+                M.ClockModule {
                     visible: S.Modules.clock.enable
                 }
-                M.Notifications {
+                M.NotificationsModule {
                     bar: bar
                     visible: S.Modules.notifications.enable
                 }
@@ -130,14 +130,14 @@ PanelWindow {
             M.BarGroup {
                 id: workspacesGroup
                 leftEdge: true
-                M.Workspaces {
+                M.WorkspacesModule {
                     bar: bar
                     visible: S.Modules.workspaces.enable
                 }
             }
             M.BarGroup {
                 leftEdge: !workspacesGroup.visible
-                M.Tray {
+                M.TrayModule {
                     bar: bar
                 }
             }
@@ -146,7 +146,7 @@ PanelWindow {
                 Layout.minimumWidth: 0
                 clip: true
                 visible: S.Modules.windowTitle.enable && M.NiriIpc.focusedTitle !== ""
-                M.WindowTitle {
+                M.WindowTitleModule {
                     id: _windowTitle
                     readonly property real _maxWidth: Math.max(0, centerSection.x - _windowTitleGroup.x - 2 * S.Theme.groupPadding - S.Theme.groupSpacing)
                     width: Math.min(naturalWidth, _maxWidth)
@@ -170,52 +170,52 @@ PanelWindow {
 
             // Media
             M.BarGroup {
-                M.Mpris {
+                M.MprisModule {
                     bar: bar
                 }
-                M.Volume {
+                M.VolumeModule {
                     visible: S.Modules.volume.enable
                 }
             }
 
             // Connectivity
             M.BarGroup {
-                M.Network {
+                M.NetworkModule {
                     bar: bar
                     visible: S.Modules.network.enable
                 }
-                M.Bluetooth {
+                M.BluetoothModule {
                     bar: bar
                 }
             }
 
             // Controls
             M.BarGroup {
-                M.Backlight {}
+                M.BacklightModule {}
-                M.PowerProfile {
+                M.PowerProfileModule {
                     visible: S.Modules.powerProfile.enable
                 }
-                M.IdleInhibitor {
+                M.IdleInhibitorModule {
                     visible: S.Modules.idleInhibitor.enable
                 }
             }
 
             // Stats
             M.BarGroup {
-                M.Cpu {
+                M.CpuModule {
                     visible: S.Modules.cpu.enable
                 }
-                M.Memory {
+                M.MemoryModule {
                     visible: S.Modules.memory.enable
                 }
-                M.Gpu {}
+                M.GpuModule {}
-                M.Temperature {
+                M.TemperatureModule {
                     visible: S.Modules.temperature.enable
                 }
-                M.Weather {
+                M.WeatherModule {
                     visible: S.Modules.weather.enable
                 }
-                M.Disk {
+                M.DiskModule {
                     visible: S.Modules.disk.enable
                 }
             }
@@ -223,8 +223,8 @@ PanelWindow {
             // Power
             M.BarGroup {
                 rightEdge: true
-                M.Battery {}
+                M.BatteryModule {}
-                M.Power {
+                M.PowerModule {
                     bar: bar
                     visible: S.Modules.power.enable
                 }

shell/modules/qmldir

@@ -4,32 +4,32 @@ Bar 1.0 Bar.qml
 BarGroup 1.0 BarGroup.qml
 BarSection 1.0 BarSection.qml
 Flyout 1.0 Flyout.qml
-Workspaces 1.0 Workspaces.qml
+WorkspacesModule 1.0 WorkspacesModule.qml
-WindowTitle 1.0 WindowTitle.qml
+WindowTitleModule 1.0 WindowTitleModule.qml
-Clock 1.0 Clock.qml
+ClockModule 1.0 ClockModule.qml
-Volume 1.0 Volume.qml
+VolumeModule 1.0 VolumeModule.qml
-Tray 1.0 Tray.qml
+TrayModule 1.0 TrayModule.qml
 TrayMenu 1.0 TrayMenu.qml
 PopupBackground 1.0 PopupBackground.qml
 HoverPanel 1.0 HoverPanel.qml
 PowerMenu 1.0 PowerMenu.qml
 ScreenCorners 1.0 ScreenCorners.qml
 ThemedIcon 1.0 ThemedIcon.qml
-Battery 1.0 Battery.qml
+BatteryModule 1.0 BatteryModule.qml
-Mpris 1.0 Mpris.qml
+MprisModule 1.0 MprisModule.qml
-Network 1.0 Network.qml
+NetworkModule 1.0 NetworkModule.qml
 NetworkMenu 1.0 NetworkMenu.qml
-Bluetooth 1.0 Bluetooth.qml
+BluetoothModule 1.0 BluetoothModule.qml
 BluetoothMenu 1.0 BluetoothMenu.qml
-Backlight 1.0 Backlight.qml
+BacklightModule 1.0 BacklightModule.qml
-Cpu 1.0 Cpu.qml
+CpuModule 1.0 CpuModule.qml
-Memory 1.0 Memory.qml
+MemoryModule 1.0 MemoryModule.qml
-Disk 1.0 Disk.qml
+DiskModule 1.0 DiskModule.qml
-Temperature 1.0 Temperature.qml
+TemperatureModule 1.0 TemperatureModule.qml
-Weather 1.0 Weather.qml
+WeatherModule 1.0 WeatherModule.qml
-PowerProfile 1.0 PowerProfile.qml
+PowerProfileModule 1.0 PowerProfileModule.qml
-IdleInhibitor 1.0 IdleInhibitor.qml
+IdleInhibitorModule 1.0 IdleInhibitorModule.qml
-Notifications 1.0 Notifications.qml
+NotificationsModule 1.0 NotificationsModule.qml
 singleton NiriIpc 1.0 NiriIpc.qml
 singleton PowerProfileService 1.0 PowerProfileService.qml
 ProcessList 1.0 ProcessList.qml
@@ -37,7 +37,11 @@ singleton NotifService 1.0 NotifService.qml
 NotifItem 1.0 NotifItem.qml
 NotifPopup 1.0 NotifPopup.qml
 NotifCenter 1.0 NotifCenter.qml
-Power 1.0 Power.qml
+NotifCard 1.0 NotifCard.qml
-Privacy 1.0 Privacy.qml
+PowerModule 1.0 PowerModule.qml
+PrivacyModule 1.0 PrivacyModule.qml
 BackgroundOverlay 1.0 BackgroundOverlay.qml
 OverviewBackdrop 1.0 OverviewBackdrop.qml
+GpuModule 1.0 GpuModule.qml
+BarIcon 1.0 BarIcon.qml
+BarLabel 1.0 BarLabel.qml

shell/shell.qml

@@ -1,6 +1,7 @@
 //@ pragma Env QS_NO_RELOAD_POPUP=1
 
 import "modules"
+import "services"
 import "lock" as Lock
 import Quickshell