Services in subfolder + cleanup/fixes

Assets/settings-default.json

@@ -1,5 +1,5 @@
 {
-  "settingsVersion": 20,
+  "settingsVersion": 21,
   "setupCompleted": false,
   "bar": {
     "position": "top",

Commons/KeyboardLayout.qml

@@ -2,6 +2,7 @@ pragma Singleton
 
 import QtQuick
 
+// TODO:  Move to KeyboardLayoutService.
 QtObject {
   id: root
 

Commons/Settings.qml

@@ -4,7 +4,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import "../Helpers/QtObj2JS.js" as QtObj2JS
 
 Singleton {

Commons/Style.qml

@@ -2,9 +2,7 @@ pragma Singleton
 
 import QtQuick
 import Quickshell
-import Quickshell.Io
-
-import qs.Services
+import qs.Services.Power
 
 Singleton {
   id: root

Modules/Background/Background.qml

@@ -2,7 +2,8 @@ import QtQuick
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 
 Variants {
   id: backgroundVariants
@@ -109,7 +110,7 @@ Variants {
         property bool dimensionsCalculated: false
 
         source: ""
-        smooth: true
+        smooth: false
         mipmap: false
         visible: false
         cache: false
@@ -138,7 +139,7 @@ Variants {
         property bool dimensionsCalculated: false
 
         source: ""
-        smooth: true
+        smooth: false
         mipmap: false
         visible: false
         cache: false

Modules/Background/Overview.qml

@@ -3,7 +3,8 @@ import Quickshell
 import QtQuick.Effects
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 
 Loader {
   active: CompositorService.isNiri && Settings.data.wallpaper.enabled && Settings.data.wallpaper.overviewEnabled

Modules/Bar/Bar.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Services.UPower
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 import qs.Modules.Notification
 import qs.Modules.Bar.Extras

Modules/Bar/Extras/BarPill.qml

@@ -2,7 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 Item {

Modules/Bar/Extras/BarPillHorizontal.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Bar/Extras/BarPillVertical.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Bar/Extras/BarWidgetLoader.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell
-import qs.Services
+import qs.Services.UI
 import qs.Commons
 
 Item {

Modules/Bar/Widgets/ActiveWindow.qml

@@ -1,11 +1,9 @@
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Wayland
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Bar/Widgets/AudioVisualizer.qml

@@ -1,9 +1,10 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Widgets.AudioSpectrum
-import qs.Services
+import qs.Services.UI
+import qs.Services.Media
 import qs.Widgets
+import qs.Widgets.AudioSpectrum
 
 Item {
   id: root

Modules/Bar/Widgets/Battery.qml

@@ -3,7 +3,8 @@ import Quickshell
 import Quickshell.Services.UPower
 import QtQuick.Layouts
 import qs.Commons
-import qs.Services
+import qs.Services.UI
+import qs.Services.Hardware
 import qs.Widgets
 import qs.Modules.Bar.Extras
 

Modules/Bar/Widgets/Bluetooth.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Modules.Bar.Extras
 
 Item {

Modules/Bar/Widgets/Brightness.qml

@@ -3,7 +3,7 @@ import Quickshell
 import qs.Commons
 import qs.Modules.Bar.Extras
 import qs.Modules.Panels.Settings
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Bar/Widgets/Clock.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Rectangle {

Modules/Bar/Widgets/ControlCenter.qml

@@ -4,7 +4,7 @@ import Quickshell.Widgets
 import QtQuick.Effects
 import qs.Commons
 import qs.Widgets
-import qs.Services
+import qs.Services.UI
 
 NIconButton {
   id: root
@@ -48,9 +48,9 @@ NIconButton {
     var controlCenterPanel = PanelService.getPanel("controlCenterPanel", screen)
     if (Settings.data.controlCenter.position === "close_to_bar_button") {
       // Willopen the panel next to the bar button.
-      controlCenterPanel.toggle(this)
+      controlCenterPanel?.toggle(this)
     } else {
-      controlCenterPanel.toggle()
+      controlCenterPanel?.toggle()
     }
   }
   onRightClicked: PanelService.getPanel("settingsPanel", screen)?.toggle()

Modules/Bar/Widgets/CustomButton.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 import qs.Modules.Panels.Settings
 import qs.Modules.Bar.Extras

Modules/Bar/Widgets/DarkMode.qml

@@ -1,7 +1,7 @@
 import Quickshell
 import qs.Commons
 import qs.Widgets
-import qs.Services
+import qs.Services.UI
 
 NIconButton {
   id: root

Modules/Bar/Widgets/KeepAwake.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/KeyboardLayout.qml

@@ -4,7 +4,8 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.UI
+import qs.Services.Keyboard
 import qs.Widgets
 import qs.Modules.Bar.Extras
 

Modules/Bar/Widgets/LockKeys.qml

@@ -4,7 +4,8 @@ import Quickshell
 import Quickshell.Io
 import qs.Commons
 import qs.Modules.Panels.Settings
-import qs.Services
+import qs.Services.Keyboard
+import qs.Services.UI
 import qs.Widgets
 
 //import qs.Modules.Bar.Extras

Modules/Bar/Widgets/MediaMini.qml

@@ -4,7 +4,8 @@ import QtQuick.Layouts
 import Quickshell
 import qs.Widgets.AudioSpectrum
 import qs.Commons
-import qs.Services
+import qs.Services.Media
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Bar/Widgets/Microphone.qml

@@ -3,10 +3,10 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Modules.Panels.Settings
-import qs.Services
-import qs.Widgets
 import qs.Modules.Bar.Extras
+import qs.Modules.Panels.Settings
+import qs.Services.UI
+import qs.Widgets
 
 Item {
   id: root

Modules/Bar/Widgets/NightLight.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Commons
 import qs.Modules.Panels.Settings
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/NoctaliaPerformance.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Commons
 import qs.Modules.Panels.Settings
-import qs.Services
+import qs.Services.Power
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/NotificationHistory.qml

@@ -4,7 +4,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.UI
+import qs.Services.System
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/PowerProfile.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Services.UPower
 import qs.Commons
-import qs.Services
+import qs.Services.Power
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/ScreenRecorder.qml

@@ -1,6 +1,8 @@
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
+import qs.Services.Media
+import qs.Services.System
 import qs.Widgets
 
 // Screen Recording Indicator

Modules/Bar/Widgets/SessionMenu.qml

@@ -2,7 +2,6 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/Spacer.qml

@@ -2,7 +2,6 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 Item {

Modules/Bar/Widgets/SystemMonitor.qml

@@ -3,7 +3,8 @@ import QtQuick.Layouts
 import Quickshell
 import qs.Commons
 import qs.Modules.Panels.Settings
-import qs.Services
+import qs.Services.UI
+import qs.Services.System
 import qs.Widgets
 
 Rectangle {

Modules/Bar/Widgets/Taskbar.qml

@@ -5,7 +5,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 import qs.Widgets
 
 Rectangle {

Modules/Bar/Widgets/TaskbarGrouped.qml

@@ -5,7 +5,8 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Bar/Widgets/Tray.qml

@@ -7,7 +7,7 @@ import Quickshell.Services.SystemTray
 import Quickshell.Widgets
 import qs.Commons
 import qs.Modules.Bar.Extras
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Rectangle {

Modules/Bar/Widgets/Volume.qml

@@ -3,10 +3,11 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Modules.Panels.Settings
-import qs.Services
-import qs.Widgets
 import qs.Modules.Bar.Extras
+import qs.Modules.Panels.Settings
+import qs.Services.UI
+import qs.Services.Media
+import qs.Widgets
 
 Item {
   id: root

Modules/Bar/Widgets/WallpaperSelector.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 NIconButton {

Modules/Bar/Widgets/WiFi.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Modules.Bar.Extras
 
 Item {

Modules/Bar/Widgets/Workspace.qml

@@ -6,7 +6,8 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 import qs.Widgets
 
 Item {

Modules/Dock/Dock.qml

@@ -6,7 +6,7 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 Loader {

Modules/Dock/DockMenu.qml

@@ -5,7 +5,6 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 PopupWindow {

Modules/LockScreen/LockScreen.qml

@@ -9,7 +9,6 @@ import Quickshell.Services.UPower
 import Quickshell.Io
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
 import qs.Widgets
 import qs.Widgets.AudioSpectrum
 

Modules/MainScreen/AllScreens.qml

@@ -3,7 +3,7 @@ import Quickshell
 import Quickshell.Wayland
 
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Modules.MainScreen
 
 // ------------------------------

Modules/MainScreen/MainScreen.qml

@@ -3,7 +3,7 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import "Backgrounds" as Backgrounds
 
 // All panels
@@ -49,17 +49,6 @@ PanelWindow {
     Logger.d("MainScreen", "Initialized for screen:", screen?.name, "- Dimensions:", screen?.width, "x", screen?.height, "- Position:", screen?.x, ",", screen?.y)
   }
 
-  // Debug: Log mask region changes
-  onMaskChanged: {
-    Logger.d("MainScreen", "Mask changed!")
-    Logger.d("MainScreen", "  Bar region:", barLoader.item?.barRegion)
-    Logger.d("MainScreen", "  Panel count:", panelsRepeater.count)
-    for (var i = 0; i < panelsRepeater.count; i++) {
-      var panelItem = panelsRepeater.itemAt(i)?.item
-      Logger.d("MainScreen", "  Panel", i, "- open:", panelItem?.isPanelOpen, "- region:", panelItem?.panelRegion)
-    }
-  }
-
   // Wayland
   // Always use Exclusive keyboard focus when a panel is open
   // This ensures all keyboard shortcuts work reliably (Escape, etc.)

Modules/MainScreen/ScreenCorners.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Shapes
 import qs.Commons
-import qs.Services
 
 
 /**

Modules/MainScreen/SmartPanel.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 
 
 /**

Modules/Notification/Notification.qml

@@ -6,7 +6,7 @@ import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Services.Notifications
 import qs.Commons
-import qs.Services
+import qs.Services.System
 import qs.Widgets
 
 // Simple notification popup - displays multiple notifications

Modules/OSD/OSD.qml

@@ -5,8 +5,10 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
 import qs.Widgets
+import qs.Services.Hardware
+import qs.Services.Media
+import qs.Services.System
 
 // Unified OSD component
 // Loader activates only when showing OSD, deactivates when hidden to save resources

Modules/Panels/Audio/AudioPanel.qml

@@ -4,9 +4,9 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Services
 import qs.Widgets
 import qs.Modules.MainScreen
+import qs.Services.Media
 
 SmartPanel {
   id: root

Modules/Panels/Battery/BatteryPanel.qml

@@ -4,7 +4,7 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.Hardware
 import qs.Widgets
 import qs.Modules.MainScreen
 

Modules/Panels/Bluetooth/BluetoothDevicesList.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Bluetooth
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.Networking
 import qs.Widgets
 
 NBox {

Modules/Panels/Bluetooth/BluetoothPanel.qml

@@ -3,9 +3,9 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell
 import Quickshell.Bluetooth
-import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.UI
+import qs.Services.Networking
 import qs.Widgets
 import qs.Modules.MainScreen
 
@@ -13,7 +13,7 @@ SmartPanel {
   id: root
 
   preferredWidth: Math.round(340 * Style.uiScaleRatio)
-  preferredHeight: 500 * Style.uiScaleRatio
+  preferredHeight: Math.round(500 * Style.uiScaleRatio)
 
   panelContent: Rectangle {
     color: Color.transparent

Modules/Panels/Calendar/CalendarPanel.qml

@@ -4,10 +4,11 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
-import qs.Widgets
 import qs.Modules.MainScreen
 import qs.Modules.Panels.ControlCenter.Cards
+import qs.Services.Location
+import qs.Services.UI
+import qs.Widgets
 
 SmartPanel {
   id: root

Modules/Panels/ControlCenter/Cards/AudioCard.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Media
 import qs.Widgets
 
 // Audio controls card: output and input volume controls

Modules/Panels/ControlCenter/Cards/MediaCard.qml

@@ -3,10 +3,11 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Effects
 import Quickshell
-import qs.Widgets.AudioSpectrum
 import qs.Commons
-import qs.Services
+import qs.Services.Media
+import qs.Services.UI
 import qs.Widgets
+import qs.Widgets.AudioSpectrum
 
 NBox {
   id: root

Modules/Panels/ControlCenter/Cards/ProfileCard.qml

@@ -5,10 +5,10 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
-import qs.Widgets
 import qs.Modules.Panels.ControlCenter.Cards
 import qs.Modules.Panels.Settings
+import qs.Services.UI
+import qs.Widgets
 
 // Header card with avatar, user and quick actions
 NBox {

Modules/Panels/ControlCenter/Cards/ShortcutsCard.qml

@@ -3,7 +3,6 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
 import qs.Widgets
 import qs.Modules.Panels.ControlCenter
 import qs.Modules.Panels.ControlCenter.Cards

Modules/Panels/ControlCenter/Cards/SystemMonitorCard.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.System
 import qs.Widgets
 
 // Unified system card: monitors CPU, temp, memory, disk

Modules/Panels/ControlCenter/Cards/WeatherCard.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Location
 import qs.Widgets
 
 // Weather overview card (placeholder data)

Modules/Panels/ControlCenter/ControlCenterPanel.qml

@@ -3,10 +3,11 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
-import qs.Widgets
 import qs.Modules.MainScreen
 import qs.Modules.Panels.ControlCenter.Cards
+import qs.Services.Media
+import qs.Services.UI
+import qs.Widgets
 
 SmartPanel {
   id: root

Modules/Panels/ControlCenter/ControlCenterWidgetLoader.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell
-import qs.Services
+import qs.Services.UI
 import qs.Commons
 
 Item {

Modules/Panels/ControlCenter/Widgets/Bluetooth.qml

@@ -1,7 +1,8 @@
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Networking
+import qs.Services.UI
 import qs.Widgets
 
 NIconButtonHot {

Modules/Panels/ControlCenter/Widgets/CustomButton.qml

@@ -2,7 +2,6 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 Item {

Modules/Panels/ControlCenter/Widgets/KeepAwake.qml

@@ -1,7 +1,7 @@
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Power
 import qs.Widgets
 
 NIconButtonHot {

Modules/Panels/ControlCenter/Widgets/NightLight.qml

@@ -2,7 +2,8 @@ import QtQuick.Layouts
 import Quickshell
 import qs.Commons
 import qs.Modules.Panels.Settings
-import qs.Services
+import qs.Services.System
+import qs.Services.UI
 import qs.Widgets
 
 NIconButtonHot {

Modules/Panels/ControlCenter/Widgets/Notifications.qml

@@ -1,7 +1,8 @@
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.System
+import qs.Services.UI
 import qs.Widgets
 
 NIconButtonHot {

Modules/Panels/ControlCenter/Widgets/PowerProfile.qml

@@ -2,7 +2,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Services.UPower
 import qs.Commons
-import qs.Services
+import qs.Services.Power
 import qs.Widgets
 
 // Performance
@@ -15,7 +15,5 @@ NIconButtonHot {
   icon: PowerProfileService.getIcon()
   hot: !PowerProfileService.isDefault()
   tooltipText: I18n.tr("quickSettings.powerProfile.tooltip.action")
-  onClicked: {
-    PowerProfileService.cycleProfile()
-  }
+  onClicked: PowerProfileService.cycleProfile()
 }

Modules/Panels/ControlCenter/Widgets/ScreenRecorder.qml

@@ -1,7 +1,7 @@
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 NIconButtonHot {
@@ -14,8 +14,7 @@ NIconButtonHot {
   onClicked: {
     ScreenRecorderService.toggleRecording()
     if (!ScreenRecorderService.isRecording) {
-      var panel = PanelService.getPanel("controlCenterPanel", screen)
-      panel?.close()
+      PanelService.getPanel("controlCenterPanel", screen)?.close
     }
   }
 }

Modules/Panels/ControlCenter/Widgets/WallpaperSelector.qml

@@ -1,7 +1,7 @@
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 NIconButtonHot {

Modules/Panels/ControlCenter/Widgets/WiFi.qml

@@ -1,7 +1,8 @@
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Networking
+import qs.Services.UI
 import qs.Widgets
 
 NIconButtonHot {

Modules/Panels/Launcher/Launcher.qml

@@ -4,7 +4,6 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
 import qs.Commons
-import qs.Services
 import qs.Widgets
 import qs.Modules.MainScreen
 import "Plugins"
@@ -13,8 +12,8 @@ SmartPanel {
   id: root
 
   // Panel configuration
-  preferredWidth: 500 * Style.uiScaleRatio
-  preferredHeight: 600 * Style.uiScaleRatio
+  preferredWidth: Math.round(500 * Style.uiScaleRatio)
+  preferredHeight: Math.round(600 * Style.uiScaleRatio)
   preferredWidthRatio: 0.3
   preferredHeightRatio: 0.5
 

Modules/Panels/Launcher/Plugins/ApplicationsPlugin.qml

@@ -2,7 +2,6 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
 import "../../../../Helpers/FuzzySort.js" as Fuzzysort
 
 Item {

Modules/Panels/Launcher/Plugins/CalculatorPlugin.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import qs.Services
 import qs.Commons
 import "../../../../Helpers/AdvancedMath.js" as AdvancedMath
 

Modules/Panels/Launcher/Plugins/ClipboardPlugin.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Keyboard
 
 Item {
   id: root

Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Services.Notifications
 import qs.Commons
-import qs.Services
+import qs.Services.System
 import qs.Widgets
 import qs.Modules.MainScreen
 

Modules/Panels/SessionMenu/SessionMenu.qml

@@ -7,7 +7,7 @@ import Quickshell.Io
 import Quickshell.Widgets
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
 import qs.Widgets
 import qs.Modules.MainScreen
 

Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml

@@ -4,7 +4,7 @@ import QtQuick.Effects
 import QtQuick.Layouts
 import qs.Commons
 import qs.Widgets
-import qs.Services
+import qs.Services.UI
 
 // Widget Settings Dialog Component
 Popup {

Modules/Panels/Settings/ControlCenter/ControlCenterWidgetSettingsDialog.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import qs.Commons
 import qs.Widgets
-import qs.Services
+import qs.Services.UI
 
 // Widget Settings Dialog Component
 Popup {

Modules/Panels/Settings/SettingsPanel.qml

@@ -2,12 +2,11 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Wayland
 import qs.Modules.Panels.Settings.Tabs
 import qs.Commons
-import qs.Services
-import qs.Widgets
 import qs.Modules.MainScreen
+import qs.Services.System
+import qs.Widgets
 
 SmartPanel {
   id: root

Modules/Panels/Settings/Tabs/AboutTab.qml

@@ -5,7 +5,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.Noctalia
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/AudioTab.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Services
+import qs.Services.Media
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/BarTab.qml

@@ -3,7 +3,8 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/ColorSchemeTab.qml

@@ -4,7 +4,9 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.DynamicTheming
+import qs.Services.System
+import qs.Services.UI
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/ControlCenterTab.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.UI
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/DisplayTab.qml

@@ -4,7 +4,9 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.Location
+import qs.Services.Hardware
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/DockTab.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/GeneralTab.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.System
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/HooksTab.qml

@@ -2,7 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import qs.Commons
-import qs.Services
+import qs.Services.Control
+import qs.Services.UI
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/LauncherTab.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import qs.Commons
-import qs.Services
+import qs.Services.System
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/LocationTab.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import qs.Commons
-import qs.Services
+import qs.Services.Location
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/NetworkTab.qml

@@ -2,9 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Bluetooth
 import qs.Commons
-import qs.Services
+import qs.Services.Networking
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/NotificationsTab.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/OsdTab.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/Settings/Tabs/WallpaperTab.qml

@@ -4,7 +4,8 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
+import qs.Services.Compositor
+import qs.Services.UI
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/SetupWizard/SetupAppearanceStep.qml

@@ -3,7 +3,6 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell.Io
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/SetupWizard/SetupCustomizeStep.qml

@@ -3,7 +3,6 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/SetupWizard/SetupDockStep.qml

@@ -3,7 +3,6 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell
 import qs.Commons
-import qs.Services
 import qs.Widgets
 
 ColumnLayout {

Modules/Panels/SetupWizard/SetupWallpaperStep.qml

@@ -5,7 +5,6 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Io
 import qs.Commons
-import qs.Services
 import qs.Widgets
 import "../../../Helpers/FuzzySort.js" as FuzzySort
 

Modules/Panels/SetupWizard/SetupWizard.qml

@@ -4,7 +4,6 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Wayland
 import qs.Commons
-import qs.Services
 import qs.Widgets
 import qs.Modules.MainScreen