diff --git a/config/Config.qml b/config/Config.qml deleted file mode 100644 index 2cd8ea0..0000000 --- a/config/Config.qml +++ /dev/null @@ -1,9 +0,0 @@ -pragma Singleton - -import Quickshell - -Singleton { - id: root - - readonly property PowerMenu powermenu: PowerMenu {} -} diff --git a/config/PowerMenu.qml b/config/PowerMenu.qml deleted file mode 100644 index 0046bd9..0000000 --- a/config/PowerMenu.qml +++ /dev/null @@ -1,18 +0,0 @@ -import Quickshell - -PersistentProperties { - property list actions: [ - { - text: "󰍃 Logout", - command: "hyprctl dispatch exit" - }, - { - text: "󰜉 Reboot", - command: "systemctl reboot" - }, - { - text: " Shutdown", - command: "systemctl poweroff" - } - ] -} diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index c18d940..95ece49 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -1,4 +1,3 @@ -import qs.components import qs.config import qs.widgets import Quickshell diff --git a/modules/bar/components/Memory.qml b/modules/bar/components/Memory.qml index 24a967a..450dfbc 100644 --- a/modules/bar/components/Memory.qml +++ b/modules/bar/components/Memory.qml @@ -1,9 +1,8 @@ -import qs.components import qs.config import qs.constants import qs.services -import qs.widgets import qs.utils +import qs.widgets import QtQuick import QtQuick.Layouts diff --git a/modules/bar/components/Network.qml b/modules/bar/components/Network.qml index f89010d..e8f01b2 100644 --- a/modules/bar/components/Network.qml +++ b/modules/bar/components/Network.qml @@ -1,4 +1,3 @@ -import qs.components import qs.config import qs.constants import qs.services diff --git a/modules/bar/components/Storage.qml b/modules/bar/components/Storage.qml index 56fbeb3..f0d437e 100644 --- a/modules/bar/components/Storage.qml +++ b/modules/bar/components/Storage.qml @@ -1,4 +1,3 @@ -import qs.components import qs.config import qs.constants import qs.services diff --git a/modules/bar/components/bluetooth/AvailableDevice.qml b/modules/bar/components/bluetooth/AvailableDevice.qml index e50541e..df0c85f 100644 --- a/modules/bar/components/bluetooth/AvailableDevice.qml +++ b/modules/bar/components/bluetooth/AvailableDevice.qml @@ -1,6 +1,5 @@ pragma ComponentBehavior: Bound -import qs.components import qs.config import qs.widgets import QtQuick diff --git a/modules/bar/components/bluetooth/ConnectedDevice.qml b/modules/bar/components/bluetooth/ConnectedDevice.qml index 3a2838c..ed23fd6 100644 --- a/modules/bar/components/bluetooth/ConnectedDevice.qml +++ b/modules/bar/components/bluetooth/ConnectedDevice.qml @@ -1,6 +1,5 @@ pragma ComponentBehavior: Bound -import qs.components import qs.config import qs.constants import qs.widgets diff --git a/modules/bar/components/bluetooth/PairedDevice.qml b/modules/bar/components/bluetooth/PairedDevice.qml index 411d0c2..aa479b3 100644 --- a/modules/bar/components/bluetooth/PairedDevice.qml +++ b/modules/bar/components/bluetooth/PairedDevice.qml @@ -1,6 +1,5 @@ pragma ComponentBehavior: Bound -import qs.components import qs.config import qs.widgets import QtQuick diff --git a/modules/bar/components/notifications/NotificationItem.qml b/modules/bar/components/notifications/NotificationItem.qml index 690d800..76365df 100644 --- a/modules/bar/components/notifications/NotificationItem.qml +++ b/modules/bar/components/notifications/NotificationItem.qml @@ -1,6 +1,5 @@ pragma ComponentBehavior: Bound -import qs.components import qs.widgets import QtQuick import QtQuick.Layouts diff --git a/modules/bar/components/notifications/NotificationMenu.qml b/modules/bar/components/notifications/NotificationMenu.qml index 692937b..2394209 100644 --- a/modules/bar/components/notifications/NotificationMenu.qml +++ b/modules/bar/components/notifications/NotificationMenu.qml @@ -1,6 +1,5 @@ pragma ComponentBehavior: Bound -import qs.components import qs.config import qs.services import qs.widgets diff --git a/modules/powermenu/PowerMenu.qml b/modules/powermenu/PowerMenu.qml index 69b423b..ab131e3 100644 --- a/modules/powermenu/PowerMenu.qml +++ b/modules/powermenu/PowerMenu.qml @@ -67,7 +67,20 @@ StyledWindow { list.incrementCurrentIndex(); } - model: Config.powermenu.actions + model: [ + { + text: "󰍃 Logout", + command: "hyprctl dispatch exit" + }, + { + text: "󰜉 Reboot", + command: "systemctl reboot" + }, + { + text: " Shutdown", + command: "systemctl poweroff" + } + ] spacing: 8 diff --git a/components/StyledLabel.qml b/widgets/StyledLabel.qml similarity index 100% rename from components/StyledLabel.qml rename to widgets/StyledLabel.qml