migrate to qs imports and .qmlls.ini pattern

2025-12-09 15:05:39 -05:00 · 2025-07-16 18:47:51 -04:00
parent a49911863d
commit 457bbcd131
70 changed files with 129 additions and 212 deletions
--- a/Services/AppSearchService.qml
+++ b/Services/AppSearchService.qml
@@ -1,10 +1,10 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Io
 import Quickshell.Widgets
 import "../Common/fuzzysort.js" as Fuzzy
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/AudioService.qml
+++ b/Services/AudioService.qml
@@ -1,8 +1,8 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Services.Pipewire
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/BatteryService.qml
+++ b/Services/BatteryService.qml
@@ -1,9 +1,9 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Services.UPower
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/BluetoothService.qml
+++ b/Services/BluetoothService.qml
@@ -1,8 +1,8 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Bluetooth
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/BrightnessService.qml
+++ b/Services/BrightnessService.qml
@@ -1,8 +1,8 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/CalendarService.qml
+++ b/Services/CalendarService.qml
@@ -1,8 +1,8 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/FocusedWindowService.qml
+++ b/Services/FocusedWindowService.qml
@@ -1,8 +1,8 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/LauncherService.qml
+++ b/Services/LauncherService.qml
@@ -1,7 +1,7 @@
-import QtQuick
-import Quickshell
 pragma Singleton
 pragma ComponentBehavior: Bound
+import QtQuick
+import Quickshell

 Singleton {
    id: root
--- a/Services/NetworkService.qml
+++ b/Services/NetworkService.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import Quickshell.Io
-import "../Common"
+import qs.Common
 pragma Singleton
 pragma ComponentBehavior: Bound

--- a/Services/NiriWorkspaceService.qml
+++ b/Services/NiriWorkspaceService.qml
@@ -1,8 +1,8 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/OSDetectorService.qml
+++ b/Services/OSDetectorService.qml
@@ -1,8 +1,9 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/ProcessMonitorService.qml
+++ b/Services/ProcessMonitorService.qml
@@ -1,8 +1,9 @@
-import QtQuick
-import Quickshell
-import Quickshell.Io
 pragma Singleton
 pragma ComponentBehavior: Bound
+import
+ QtQuick
+import Quickshell
+import Quickshell.Io

 Singleton {
    id: root
--- a/Services/SystemMonitorService.qml
+++ b/Services/SystemMonitorService.qml
@@ -1,8 +1,9 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/WeatherService.qml
+++ b/Services/WeatherService.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import Quickshell.Io
-import "../Common"
+import qs.Common
 pragma Singleton
 pragma ComponentBehavior: Bound

--- a/Services/WifiService.qml
+++ b/Services/WifiService.qml
@@ -1,9 +1,9 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import Quickshell
 import Quickshell.Io
-import "."
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root
--- a/Services/qmldir
+++ b/Services/qmldir
@@ -1,18 +0,0 @@
-singleton MprisController 1.0 MprisController.qml
-singleton OSDetectorService 1.0 OSDetectorService.qml
-singleton WeatherService 1.0 WeatherService.qml
-singleton NetworkService 1.0 NetworkService.qml
-singleton WifiService 1.0 WifiService.qml
-singleton AudioService 1.0 AudioService.qml
-singleton BluetoothService 1.0 BluetoothService.qml
-singleton BrightnessService 1.0 BrightnessService.qml
-singleton BatteryService 1.0 BatteryService.qml
-singleton SystemMonitorService 1.0 SystemMonitorService.qml
-singleton ProcessMonitorService 1.0 ProcessMonitorService.qml
-singleton AppSearchService 1.0 AppSearchService.qml
-singleton LauncherService 1.0 LauncherService.qml
-singleton NiriWorkspaceService 1.0 NiriWorkspaceService.qml
-singleton CalendarService 1.0 CalendarService.qml
-singleton UserInfoService 1.0 UserInfoService.qml
-singleton FocusedWindowService 1.0 FocusedWindowService.qml
-singleton NotificationService 1.0 NotificationService.qml