diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 03808b2..a6d3498 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -1,7 +1,7 @@ import Quickshell import QtQuick -import "../../settings/" -import "../../" +import qs +import qs.settings Variants { model: Quickshell.screens diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index 0a150c3..d92c99c 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -3,9 +3,9 @@ import QtQuick import Quickshell.Widgets import Qt5Compat.GraphicalEffects import Quickshell -import "../../reusables/" -import "../../settings/" -import "../../" +import qs +import qs.reusables +import qs.settings Loader { id: batLoader diff --git a/modules/bar/Clock.qml b/modules/bar/Clock.qml index f29b34b..f29889e 100644 --- a/modules/bar/Clock.qml +++ b/modules/bar/Clock.qml @@ -1,8 +1,8 @@ import Quickshell import QtQuick -import "../../reusables/" -import "../../settings/" -import "../../" +import qs +import qs.settings +import qs.reusables Rectangle { id: container diff --git a/modules/bar/PowerProfiles.qml b/modules/bar/PowerProfiles.qml deleted file mode 100644 index e69de29..0000000 diff --git a/modules/bar/SysTray.qml b/modules/bar/SysTray.qml index 5aeeafa..2c2bcc4 100644 --- a/modules/bar/SysTray.qml +++ b/modules/bar/SysTray.qml @@ -1,7 +1,6 @@ import Quickshell.Services.SystemTray import QtQuick -import "." -import "../../settings/" +import qs.settings Item { id: root diff --git a/modules/bar/Title.qml b/modules/bar/Title.qml index 564369a..3741d4b 100644 --- a/modules/bar/Title.qml +++ b/modules/bar/Title.qml @@ -1,8 +1,8 @@ import QtQuick -import "../../reusables/" -import "../../settings/" -import "../../" import Quickshell.Wayland +import qs +import qs.settings +import qs.reusables Rectangle { id: container diff --git a/modules/bar/Volume.qml b/modules/bar/Volume.qml index d25fc4a..4eba456 100644 --- a/modules/bar/Volume.qml +++ b/modules/bar/Volume.qml @@ -2,9 +2,9 @@ import Quickshell import Quickshell.Io import QtQuick import Quickshell.Services.Pipewire -import "../../reusables/" -import "../../settings/" -import "../../" +import qs.settings +import qs.reusables +import qs Rectangle { id: container diff --git a/modules/bar/Workspaces.qml b/modules/bar/Workspaces.qml index 399567c..293cf66 100644 --- a/modules/bar/Workspaces.qml +++ b/modules/bar/Workspaces.qml @@ -1,10 +1,10 @@ pragma ComponentBehavior: Bound -import "../../reusables/" import Quickshell.Hyprland import Quickshell import QtQuick -import "../../" -import "../../settings/" +import qs +import qs.settings +import qs.reusables Item { id: root diff --git a/modules/ipc/Ipc.qml b/modules/ipc/Ipc.qml index d5ec290..ff09a77 100644 --- a/modules/ipc/Ipc.qml +++ b/modules/ipc/Ipc.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Io -import "../../settings/" +import qs.settings Item { IpcHandler { diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index 8339974..b86d4eb 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import Quickshell.Wayland -import "../../settings/" +import qs.settings Variants { model: Quickshell.screens diff --git a/modules/notifications/NotificationCard.qml b/modules/notifications/NotificationCard.qml index 6b16978..2c57710 100644 --- a/modules/notifications/NotificationCard.qml +++ b/modules/notifications/NotificationCard.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts -import "../../" -import "../../reusables" +import qs +import qs.reusables import Quickshell.Widgets Rectangle { diff --git a/modules/notifications/qmldir b/modules/notifications/qmldir deleted file mode 100644 index 3d7b319..0000000 --- a/modules/notifications/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -singleton NotiServer 1.0 NotiServer.qml -Notification 1.0 Notification.qml -NotificationCard 1.0 NotificationCard.qml - diff --git a/modules/overlays/Wallpaper.qml b/modules/overlays/Wallpaper.qml index 3e27ceb..ba11b22 100644 --- a/modules/overlays/Wallpaper.qml +++ b/modules/overlays/Wallpaper.qml @@ -2,15 +2,15 @@ pragma ComponentBehavior: Bound import Quickshell import QtQuick import Quickshell.Wayland -import "../../settings/" +import qs.settings Variants { id: root model: Quickshell.screens delegate: WlrLayershell { id: wpShell - aboveWindows: false -exclusionMode: ExclusionMode.Ignore + aboveWindows: false + exclusionMode: ExclusionMode.Ignore required property var modelData screen: modelData diff --git a/modules/polkit/Polkit.qml b/modules/polkit/Polkit.qml deleted file mode 100644 index 4833dd1..0000000 --- a/modules/polkit/Polkit.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Quickshell -import Quickshell.Services.Polkit - - - diff --git a/qmldir b/qmldir deleted file mode 100644 index b7cddb9..0000000 --- a/qmldir +++ /dev/null @@ -1 +0,0 @@ -singleton Colors 1.0 Colors.qml diff --git a/reusables/CustomIcon.qml b/reusables/CustomIcon.qml index e19aae3..5e68ffc 100644 --- a/reusables/CustomIcon.qml +++ b/reusables/CustomIcon.qml @@ -1,6 +1,6 @@ import QtQuick -import "../settings/" -import "../" +import qs.settings +import qs Text { font.family: "Material Symbols Rounded" diff --git a/reusables/CustomText.qml b/reusables/CustomText.qml index 1c54b5e..21427d2 100644 --- a/reusables/CustomText.qml +++ b/reusables/CustomText.qml @@ -1,6 +1,6 @@ import QtQuick -import "../settings/" -import "../" +import qs +import qs.settings Text { color: Colors.foreground diff --git a/settings/qmldir b/settings/qmldir deleted file mode 100644 index 8f02997..0000000 --- a/settings/qmldir +++ /dev/null @@ -1 +0,0 @@ -singleton Settings 1.0 Settings.qml diff --git a/shell.qml b/shell.qml index 56d540d..261ae8c 100644 --- a/shell.qml +++ b/shell.qml @@ -1,11 +1,10 @@ //@ pragma UseQApplication import Quickshell import QtQuick -import "./settings/" -import "./modules/bar/" -import "./modules/overlays/" -import "./modules/ipc/" -import "./modules/notifications/" +import qs.modules.ipc +import qs.modules.bar +import qs.modules.overlays +import qs.modules.notifications ShellRoot { id: root