a lot of quickshell

1 files changed, 35 insertions, 154 deletions

diff --git a/home-configuration/config/quickshell/shell.qml b/home-configuration/config/quickshell/shell.qml
index c9425cd..bda5dbb 100644
--- a/home-configuration/config/quickshell/shell.qml
+++ b/home-configuration/config/quickshell/shell.qml
@@ -1,169 +1,50 @@
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Services.Notifications
+//@ pragma UseQApplication
+
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import Niri
+import "./modules/bar/"
+import "./modules/desktop/"
+import "./modules/notifications/"
 
-import "config.js" as Config
-
-Scope {
+ShellRoot {
     id: root
 
-    NotificationServer {
-        id: server
-        actionsSupported: true
-        bodySupported: true
-        imageSupported: true
+    Niri {
+        id: niri
+        Component.onCompleted: connect()
 
-        onNotification: n => {
-            n.tracked = true
+        onConnected: console.info("Connected to niri")
+        onErrorOccurred: function(error) {
+            console.error("Niri error:", error)
         }
     }
 
-    PanelWindow {
-        anchors { top: true; right: true }
-        margins { top: 12; right: 12 }
-
-        implicitWidth: 380
-        implicitHeight: Math.max(1, column.implicitHeight)
-        color: "transparent"
-        exclusionMode: ExclusionMode.Ignore
-
-        ColumnLayout {
-            id: column
-            width: parent.width
-            spacing: 10
-
-            Repeater {
-                model: server.trackedNotifications
-
-                delegate: Rectangle {
-                    id: card
-                    required property var modelData
-
-                    Layout.fillWidth: true
-                    implicitHeight: cardLayout.implicitHeight + 20
-
-                    radius: 12
-                    color: Config.colors.bgDark
-                    border.color: hoverArea.containsMouse ? Config.colors.purple : "transparent"
-                    border.width: 1
-
-                    Behavior on border.color { ColorAnimation { duration: 150 } }
-
-                    Timer {
-                        id: dismissTimer
-                        running: card.modelData.urgency !== NotificationUrgency.Critical && !hoverArea.containsMouse
-                        interval: Config.notifications.timeout
-                        repeat: false
-                        onTriggered: card.modelData.dismiss()
-                    }
-
-                    Rectangle {
-                        anchors.left: parent.left
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        width: 4
-                        radius: 12
-                        color: card.modelData.urgency === NotificationUrgency.Critical
-                            ? Config.colors.red
-                            : Config.colors.purple
-                    }
-
-                    ColumnLayout {
-                        id: cardLayout
-                        anchors.fill: parent
-                        anchors.margins: 10
-                        anchors.leftMargin: 18
-                        spacing: 8
-
-                        RowLayout {
-                            Layout.fillWidth: true
-                            spacing: 10
-
-                            Image {
-                                Layout.preferredWidth: 36
-                                Layout.preferredHeight: 36
-                                Layout.alignment: Qt.AlignTop
-                                fillMode: Image.PreserveAspectFit
-                                visible: source.toString() !== ""
-                                source: card.modelData.image || card.modelData.appIcon || ""
-                            }
-
-                            ColumnLayout {
-                                Layout.fillWidth: true
-                                spacing: 2
-
-                                Text {
-                                    Layout.fillWidth: true
-                                    text: card.modelData.summary
-                                    color: Config.colors.cyan
-                                    font.family: Config.bar.fontFamily
-                                    font.pixelSize: Config.bar.fontSize
-                                    font.bold: true
-                                    elide: Text.ElideRight
-                                }
-
-                                Text {
-                                    Layout.fillWidth: true
-                                    visible: text !== ""
-                                    text: card.modelData.body
-                                    color: Config.colors.fg
-                                    font.family: Config.bar.fontFamily
-                                    font.pixelSize: Config.bar.fontSize - 1
-                                    wrapMode: Text.WordWrap
-                                    maximumLineCount: 4
-                                    elide: Text.ElideRight
-                                }
-                            }
-                        }
-
-                        RowLayout {
-                            Layout.fillWidth: true
-                            visible: card.modelData.actions.length > 0
-                            spacing: 8
-
-                            Repeater {
-                                model: card.modelData.actions
-
-                                delegate: Rectangle {
-                                    required property var modelData
-
-                                    Layout.fillWidth: true
-                                    Layout.preferredHeight: 26
-                                    radius: 6
-                                    color: actionArea.containsMouse ? Config.colors.purple : Qt.rgba(1, 1, 1, 0.05)
+    LazyLoader {
+        active: true
+        component: Wallpaper {}
+    }
 
-                                    Text {
-                                        anchors.centerIn: parent
-                                        text: parent.modelData.text
-                                        color: Config.colors.fg
-                                        font.family: Config.bar.fontFamily
-                                        font.pixelSize: Config.bar.fontSize - 2
-                                    }
+    LazyLoader {
+        id: barLoader
+        active: true
+        component: Bar {}
+    }
 
-                                    MouseArea {
-                                        id: actionArea
-                                        anchors.fill: parent
-                                        hoverEnabled: true
-                                        cursorShape: Qt.PointingHandCursor
-                                        onClicked: card.modelData.invokeAction(parent.modelData.identifier)
-                                    }
-                                }
-                            }
-                        }
-                    }
+    IpcHandler {
+        target: "shell"
 
-                    MouseArea {
-                        id: hoverArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: card.modelData.dismiss()
-                        z: -1
-                    }
-                }
-            }
+        function restartBar(): void {
+            if (barLoader.item)
+                barLoader.item.restart()
         }
     }
+
+    LazyLoader {
+        active: true
+        component: Notifications {}
+    }
 }