13 files changed, 1020 insertions, 238 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
index d7e8e7c5..57ade488 100644
--- a/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
+++ b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
@@ -7,10 +7,11 @@ Item {
   id: activeWindowDisplay
 
   required property int maxWidth
+  required property var screen
 
   property var activeWindow: {
     let currWindowId = Array.from(NiriService.workspaces).find(ws => {
-      return ws.output === bar.screen.name && ws.is_active;
+      return ws.output === screen.name && ws.is_active;
     })?.active_window_id;
 
     return currWindowId ? Array.from(NiriService.windows).find(win => win.id == currWindowId) : null;
diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index accad2a9..38225d74 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -5,7 +5,7 @@ import QtQuick
 PanelWindow {
   id: bar
 
-  property var modelData
+  required property var screen
 
   anchors {
     top: true
@@ -17,7 +17,6 @@ PanelWindow {
     right: 26 + 8
   }
 
-  screen: modelData
   implicitHeight: 21
   color: "transparent"
 
@@ -50,6 +49,7 @@ PanelWindow {
     spacing: 5
 
     ActiveWindowDisplay {
+      screen: bar.screen
       maxWidth: bar.width - 2*Math.max(left.width, right.width) - 2*8
     }
   }
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 68efb558..382af168 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -7,216 +7,271 @@ import QtQuick.Layouts
 import Quickshell.Widgets
 
 Item {
+  id: clockItem
+
+  property bool calendarPopup: true
+
   width: clock.contentWidth
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
 
-  MouseArea {
+  WrapperMouseArea {
     id: clockMouseArea
 
     anchors.fill: parent
     hoverEnabled: true
-    enabled: true
+    enabled: clockItem.calendarPopup
+
+    Item {
+      anchors.fill: parent
+
+      Text {
+        id: clock
+        color: "white"
 
-    property real angleRem: 0
-    property real sensitivity: 1 / 120
+        anchors.verticalCenter: parent.verticalCenter
+
+        Custom.Chrono {
+          id: chrono
+
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
 
-    onWheel: event => {
-      angleRem += event.angleDelta.y;
-      const d = Math.round(angleRem * sensitivity);
-      yearCalendar.year += d;
-      angleRem -= d / sensitivity;
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        font.features: { "tnum": 1 }
+      }
     }
   }
 
-  Text {
-    id: clock
-    color: "white"
+  Loader {
+    id: tooltipLoader
 
-    anchors.verticalCenter: parent.verticalCenter
+    active: false
 
-    Custom.Chrono {
-      id: chrono
-      format: "W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}"
+    Connections {
+      target: clockMouseArea
+      function onContainsMouseChanged() {
+       if (clockMouseArea.containsMouse)
+         tooltipLoader.active = true;
+      }
     }
 
-    text: chrono.date
+    sourceComponent: PopupWindow {
+      id: tooltip
 
-    font.pointSize: 10
-    font.family: "Fira Sans"
-    font.features: { "tnum": 1 }
-  }
+      property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse
 
-  PopupWindow {
-    anchor {
-      item: clockMouseArea
-      edges: Edges.Bottom
-    }
-    visible: clockMouseArea.containsMouse
+      anchor {
+        item: clockMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
 
-    implicitWidth: clockTooltipContent.width
-    implicitHeight: clockTooltipContent.height
-    color: "black"
+      onNextVisibleChanged: hangTimer.restart()
 
-    onVisibleChanged: {
-      const d = new Date();
-      yearCalendar.year = d.getFullYear();
-      clockMouseArea.angleRem = 0;
-    }
+      Timer {
+        id: hangTimer
+        interval: 100
+        onTriggered: tooltip.visible = tooltip.nextVisible
+      }
 
-    WrapperItem {
-      id: clockTooltipContent
+      implicitWidth: clockTooltipContent.width
+      implicitHeight: clockTooltipContent.height
+      color: "black"
 
-      margin: 8
-      leftMargin: 0
+      onVisibleChanged: {
+        yearCalendar.year = chrono.date.getFullYear();
+        yearCalendar.angleRem = 0;
+      }
 
-      ColumnLayout {
-        Text {
-          id: yearLabel
+      WrapperMouseArea {
+        id: tooltipMouseArea
 
-          horizontalAlignment: Text.AlignHCenter
+        hoverEnabled: true
+        enabled: true
 
-          font.pointSize: 14
-          font.family: "Fira Sans"
-          font.features: { "tnum": 1 }
-          color: "white"
+        onWheel: event => yearCalendar.scrollYear(event)
 
-          text: yearCalendar.year
+        anchors.fill: parent
 
-          Layout.fillWidth: true
-          Layout.bottomMargin: 8
-        }
+        WrapperItem {
+          id: clockTooltipContent
 
-        GridLayout {
-          property int year: { const d = new Date(); return d.getFullYear(); }
+          margin: 8
+          leftMargin: 0
 
-          id: yearCalendar
+          ColumnLayout {
+            Text {
+              id: yearLabel
 
-          columns: 3
-          columnSpacing: 16
-          rowSpacing: 16
+              horizontalAlignment: Text.AlignHCenter
 
-          Layout.alignment: Qt.AlignHCenter
-          Layout.fillWidth: false
+              font.pointSize: 14
+              font.family: "Fira Sans"
+              font.features: { "tnum": 1 }
+              color: "white"
 
-          Repeater {
-            model: 12
+              text: yearCalendar.year
+
+              Layout.fillWidth: true
+              Layout.bottomMargin: 8
+            }
 
             GridLayout {
-              columns: 2
+              property int year: chrono.date.getFullYear()
 
-              required property int index
-              property int month: index
+              id: yearCalendar
 
-              id: monthCalendar
+              columns: 3
+              columnSpacing: 16
+              rowSpacing: 16
 
-              Layout.alignment: Qt.AlignTop | Qt.AlignRight
+              Layout.alignment: Qt.AlignHCenter
               Layout.fillWidth: false
 
-              Text {
-                Layout.column: 1
-                Layout.fillWidth: true
+              property real angleRem: 0
+              property real sensitivity: 1 / 120
 
-                horizontalAlignment: Text.AlignHCenter
+              function scrollYear(event) {
+                angleRem += event.angleDelta.y;
+                const d = Math.round(angleRem * sensitivity);
+                yearCalendar.year += d;
+                angleRem -= d / sensitivity;
+              }
 
-                font.pointSize: 10
-                font.family: "Fira Sans"
+              Connections {
+                target: clockMouseArea
+                function onWheel(event) { yearCalendar.scrollYear(event); }
+              }
 
-                text: {
-                  const date = Date.fromLocaleDateString(Qt.locale(), `${yearCalendar.year}-${monthCalendar.month + 1}-01`, "yyyy-M-dd");
-                  return date.toLocaleString(Qt.locale("en_DK"), "MMMM")
-                }
+              Repeater {
+                model: 12
 
-                color: "#ffead3"
-              }
+                GridLayout {
+                  columns: 2
 
-              DayOfWeekRow {
-                locale: grid.locale
+                  required property int index
+                  property int month: index
 
-                Layout.row: 1
-                Layout.column: 1
-                Layout.fillWidth: true
+                  id: monthCalendar
 
-                delegate: Text {
-                  required property string shortName
+                  Layout.alignment: Qt.AlignTop | Qt.AlignRight
+                  Layout.fillWidth: false
 
-                  font.pointSize: 10
-                  font.family: "Fira Mono"
+                  Text {
+                    Layout.column: 1
+                    Layout.fillWidth: true
 
-                  text: shortName
-                  color: "#ffcc66"
+                    horizontalAlignment: Text.AlignHCenter
 
-                  horizontalAlignment: Text.AlignRight
-                  verticalAlignment: Text.AlignVCenter
-                }
-              }
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
 
-              WeekNumberColumn {
-                month: grid.month
-                year: grid.year
-                locale: grid.locale
+                    text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
 
-                Layout.fillHeight: true
+                    color: "#ffead3"
+                  }
 
-                delegate: Text {
-                  required property int weekNumber
+                  DayOfWeekRow {
+                    locale: grid.locale
 
-                  opacity: {
-                    const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7);
-                    const dayOfWeek = simple.getDay();
-                    const isoWeekStart = simple;
+                    Layout.row: 1
+                    Layout.column: 1
+                    Layout.fillWidth: true
 
-                    isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
-                    if (dayOfWeek > 4) {
-                        isoWeekStart.setDate(isoWeekStart.getDate() + 7);
-                    }
+                    delegate: WrapperItem {
+                      required property string shortName
 
-                    for (let i = 0; i < 7; i++) {
-                      const dayInWeek = new Date(isoWeekStart);
-                      dayInWeek.setDate(dayInWeek.getDate() + i);
-                      if (dayInWeek.getMonth() == monthCalendar.month)
-                        return 1;
-                    }
+                      width: dowLabel.contentWidth + 6
+
+                      Text {
+                        id: dowLabel
+
+                        anchors.fill: parent
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
 
-                    return 0;
+                        text: parent.shortName
+                        color: "#ffcc66"
+
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
+                      }
+                    }
                   }
 
-                  font.pointSize: 10
-                  font.family: "Fira Sans"
-                  font.features: { "tnum": 1 }
+                  WeekNumberColumn {
+                    month: grid.month
+                    year: grid.year
+                    locale: grid.locale
 
-                  text: weekNumber
-                  color: "#99ffdd"
+                    Layout.fillHeight: true
 
-                  horizontalAlignment: Text.AlignRight
-                  verticalAlignment: Text.AlignVCenter
-                }
-              }
+                    delegate: Text {
+                      required property int weekNumber
 
-              MonthGrid {
-                id: grid
+                      opacity: {
+                        const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7);
+                        const dayOfWeek = simple.getDay();
+                        const isoWeekStart = simple;
 
-                year: yearCalendar.year
-                month: monthCalendar.month
-                locale: Qt.locale("en_DK")
+                        isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
+                        if (dayOfWeek > 4) {
+                            isoWeekStart.setDate(isoWeekStart.getDate() + 7);
+                        }
 
-                Layout.fillWidth: true
-                Layout.fillHeight: true
+                        for (let i = 0; i < 7; i++) {
+                          const dayInWeek = new Date(isoWeekStart);
+                          dayInWeek.setDate(dayInWeek.getDate() + i);
+                          if (dayInWeek.getMonth() == monthCalendar.month)
+                            return 1;
+                        }
 
-                delegate: Text {
-                    required property var model
+                        return 0;
+                      }
 
-                    opacity: model.month === monthCalendar.month ? 1 : 0
+                      font.pointSize: 10
+                      font.family: "Fira Sans"
+                      font.features: { "tnum": 1 }
 
-                    font.pointSize: 10
-                    font.family: "Fira Sans"
-                    font.features: { "tnum": 1 }
+                      text: weekNumber
+                      color: "#99ffdd"
 
-                    text: model.day
-                    color: model.today ? "#ff6699" : "white"
+                      horizontalAlignment: Text.AlignRight
+                      verticalAlignment: Text.AlignVCenter
+                    }
+                  }
+
+                  MonthGrid {
+                    id: grid
+
+                    year: yearCalendar.year
+                    month: monthCalendar.month
+                    locale: Qt.locale("en_DK")
+
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+
+                    delegate: Text {
+                        required property var model
 
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
+                        opacity: model.month === monthCalendar.month ? 1 : 0
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+                        font.features: { "tnum": 1 }
+
+                        property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
+
+                        text: model.day
+                        color: today ? "#ff6699" : "white"
+
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                    }
+                  }
                 }
               }
             }
@@ -225,4 +280,4 @@ Item {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
index 710ea10c..bc3750f9 100644
--- a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
+++ b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
@@ -1,77 +1,105 @@
 import Quickshell
 import QtQuick
 import qs.Services
+import Quickshell.Widgets
 
-Rectangle {
-  id: kbdWidget
-
-  property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
-
+Item {
   width: kbdLabel.contentWidth + 8
-  color: {
-    if (kbdMouseArea.containsMouse) {
-      return "#33808080";
-    }
-    return "transparent";
-  }
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
 
-  MouseArea {
+  WrapperMouseArea {
     id: kbdMouseArea
 
     anchors.fill: parent
+
     hoverEnabled: true
     cursorShape: Qt.PointingHandCursor
     enabled: true
     onClicked: {
       NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": "Next" } } }, _ => {})
     }
-  }
+    onWheel: event => {
+      NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": event.angleDelta > 0 ? "Next" : "Prev" } } }, _ => {})
+    }
 
-  Text {
-    id: kbdLabel
+    Rectangle {
+      id: kbdWidget
 
-    font.pointSize: 10
-    font.family: "Fira Sans"
-    color: {
-      if (NiriService.keyboardLayouts?.current_idx === 0)
-        return "#555";
-      return "white";
-    }
-    anchors.centerIn: parent
+      property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
+
+      anchors.fill: parent
+      color: {
+        if (kbdMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
+      }
 
-    text: {
-      const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
-      if (!currentLayout)
-        return "";
-      return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+      Text {
+        id: kbdLabel
+
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        color: {
+          if (NiriService.keyboardLayouts?.current_idx === 0)
+            return "#555";
+          return "white";
+        }
+        anchors.centerIn: parent
+
+        text: {
+          const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
+          if (!currentLayout)
+            return "";
+          return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+        }
+      }
     }
   }
 
   PopupWindow {
+    id: tooltip
+
+    property bool nextVisible: kbdMouseArea.containsMouse || tooltipMouseArea.containsMouse
+
     anchor {
       item: kbdMouseArea
-      edges: Edges.Bottom
+      edges: Edges.Bottom | Edges.Left
+    }
+    visible: false
+
+    onNextVisibleChanged: hangTimer.restart()
+
+    Timer {
+      id: hangTimer
+      interval: 100
+      onTriggered: tooltip.visible = tooltip.nextVisible
     }
-    visible: kbdMouseArea.containsMouse
 
     implicitWidth: kbdTooltipText.contentWidth + 16
     implicitHeight: kbdTooltipText.contentHeight + 16
     color: "black"
 
-    Text {
-      id: kbdTooltipText
+    WrapperMouseArea {
+      id: tooltipMouseArea
+
+      hoverEnabled: true
+      enabled: true
 
       anchors.centerIn: parent
 
-      font.pointSize: 10
-      font.family: "Fira Sans"
-      color: "white"
+      Text {
+        id: kbdTooltipText
+
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        color: "white"
 
-      text: {
-        const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
-        return currentLayout || "";
+        text: {
+          const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
+          return currentLayout || "";
+        }
       }
     }
   }
diff --git a/accounts/gkleen@sif/shell/quickshell/LockSurface.qml b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
new file mode 100644
index 00000000..18698725
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
@@ -0,0 +1,223 @@
+import Quickshell.Widgets
+import QtQuick.Effects
+import QtQuick.Layouts
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Fusion
+import qs.Services
+import QtQml
+
+Item {
+  id: lockSurface
+
+  property var screen
+  property list<var> messages: []
+  property bool responseRequired: false
+  property bool responseVisible: false
+  property string currentText: ""
+  property bool authRunning: false
+
+  signal response(string responseText)
+
+  anchors.fill: parent
+
+  Item {
+    id: background
+
+    anchors.fill: parent
+
+    property Img current: one
+    property string source: selector.selected
+
+    WallpaperSelector {
+      id: selector
+      seed: lockSurface.screen?.name || ""
+    }
+
+    onSourceChanged: {
+      if (!source)
+        current = null;
+      else if (current === one)
+        two.update()
+      else
+        one.update()
+    }
+
+    Img { id: one }
+    Img { id: two }
+
+    component Img: Item {
+      id: img
+
+      property string source
+
+      function update() {
+        source = background.source || ""
+      }
+
+      anchors.fill: parent
+
+      Image {
+        id: imageSource
+
+        source: img.source
+        sourceSize: Qt.size(parent.width, parent.height)
+        fillMode: Image.PreserveAspectCrop
+        smooth: true
+        visible: false
+        asynchronous: true
+        cache: false
+
+        onStatusChanged: {
+          if (status === Image.Ready) {
+            background.current = img
+          }
+        }
+      }
+
+      MultiEffect {
+        id: imageEffect
+
+        source: imageSource
+        anchors.fill: parent
+        blurEnabled: true
+        blur: 1
+        blurMax: 64
+        blurMultiplier: 2
+
+        opacity: 0
+
+        states: State {
+          name: "visible"
+          when: background.current === img
+
+          PropertyChanges {
+            imageEffect.opacity: 1
+          }
+          StateChangeScript {
+            name: "unloadOther"
+            script: {
+              if (img === one)
+                two.source = ""
+              if (img === two)
+                one.source = ""
+            }
+          }
+        }
+
+        transitions: Transition {
+          SequentialAnimation {
+            NumberAnimation {
+              target: imageEffect
+              properties: "opacity"
+              duration: 5000
+              easing.type: Easing.OutCubic
+            }
+            ScriptAction {
+              scriptName: "unloadOther"
+            }
+          }
+        }
+      }
+    }
+  }
+
+  Item {
+    anchors {
+      top: lockSurface.top
+      left: lockSurface.left
+      right: lockSurface.right
+    }
+
+    implicitWidth: lockSurface.width
+    implicitHeight: 21
+
+    Rectangle {
+      anchors.fill: parent
+      color: Qt.rgba(0, 0, 0, 0.75)
+    }
+
+    Clock {
+      anchors.centerIn: parent
+      calendarPopup: false
+    }
+  }
+
+  WrapperRectangle {
+    id: unlockUi
+
+    Keys.onPressed: event => {
+      if (!lockSurface.authRunning) {
+        event.accepted = true;
+        lockSurface.authRunning = true;
+      }
+    }
+    focus: !passwordBox.visible
+
+    visible: lockSurface.authRunning
+
+    color: Qt.rgba(0, 0, 0, 0.75)
+    margin: 8
+
+    anchors.centerIn: parent
+
+    ColumnLayout {
+      spacing: 4
+
+      BusyIndicator {
+        visible: running
+        running: !Array.from(lockSurface.messages).length && !lockSurface.responseRequired
+      }
+
+      Repeater {
+        model: lockSurface.messages
+
+        Text {
+          required property var modelData
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          color: modelData.error ? "#f28a21" : "#ffffff"
+
+          text: String(modelData.text).trim()
+
+          Layout.fillWidth: true
+          horizontalAlignment: Text.AlignHCenter
+        }
+      }
+
+      TextField {
+        id: passwordBox
+
+        visible: lockSurface.responseRequired
+        echoMode: lockSurface.responseVisible ? TextInput.Normal : TextInput.Password
+        inputMethodHints: Qt.ImhSensitiveData
+
+        onTextChanged: lockSurface.currentText = passwordBox.text
+        onAccepted: {
+          passwordBox.readOnly = true;
+          lockSurface.response(lockSurface.currentText);
+        }
+
+        Connections {
+          target: lockSurface
+          function onCurrentTextChanged() {
+            passwordBox.text = lockSurface.currentText
+          }
+        }
+        Connections {
+          target: lockSurface
+          function onResponseRequiredChanged() {
+            if (lockSurface.responseRequired)
+              passwordBox.readOnly = false;
+              passwordBox.focus = true;
+              passwordBox.selectAll();
+          }
+        }
+
+        Layout.topMargin: 4
+        Layout.fillWidth: true
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
new file mode 100644
index 00000000..cc82a275
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -0,0 +1,77 @@
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import Quickshell.Services.Pam
+import QtQml
+
+Scope {
+  id: lockscreen
+
+  property string currentText: ""
+
+  PamContext {
+    id: pam
+
+    property list<var> messages: []
+
+    config: "quickshell"
+    onCompleted: result => {
+      if (result === PamResult.Success) {
+        lock.locked = false;
+      }
+    }
+    onPamMessage: {
+      messages = Array.from(messages).concat([{ "text": pam.message, "error": pam.messageIsError }])
+    }
+    onActiveChanged: {
+      messages = [];
+    }
+  }
+
+  IpcHandler {
+    target: "Lockscreen"
+
+    function setLocked(locked: bool): void { lock.locked = locked; }
+    function getLocked(): bool { return lock.locked; }
+  }
+
+  WlSessionLock {
+    id: lock
+
+    onLockedChanged: {
+      if (!locked && pam.active)
+        pam.abort();
+    }
+
+    WlSessionLockSurface {
+      id: lockSurface
+
+      color: "black"
+
+      LockSurface {
+        id: surfaceContent
+
+        onResponse: responseText => pam.respond(responseText)
+        onAuthRunningChanged: {
+          if (authRunning)
+            pam.start();
+        }
+        Connections {
+          target: pam
+          function onMessagesChanged() { surfaceContent.messages = pam.messages; }
+          function onResponseRequiredChanged() { surfaceContent.responseRequired = pam.responseRequired; }
+          function onActiveChanged() { surfaceContent.authRunning = pam.active; }
+        }
+        onCurrentTextChanged: lockscreen.currentText = currentText
+        Connections {
+          target: lockscreen
+          function onCurrentTextChanged() { surfaceContent.currentText = lockscreen.currentText; }
+        }
+        Connections {
+          target: lockSurface
+          function onScreenChanged() { surfaceContent.screen = lockSurface.screen; }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
index c82caaa6..af522ec4 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -28,9 +28,12 @@ Singleton {
     path: root.socketPath
     connected: true
 
+    property bool acked: false
+
     onConnectionStateChanged: {
       if (connected) {
-        write('"EventStream"\n')
+        acked = false;
+        write('"EventStream"\n');
       }
     }
 
@@ -66,6 +69,9 @@ Singleton {
             eventWindowUrgencyChanged(event.WindowUrgencyChanged);
           else if (event.WindowLayoutsChanged)
             eventWindowLayoutsChanged(event.WindowLayoutsChanged);
+          else if (event.Ok && !eventStreamSocket.acked) { eventStreamSocket.acked = true; }
+          else if (event.OverviewOpenedOrClosed) {}
+          else if (event.ConfigLoaded) {}
           else
             console.log(JSON.stringify(event));
         } catch (e) {
@@ -154,7 +160,11 @@ Singleton {
     });
   }
   function eventWindowOpenedOrChanged(data) {
-    root.windows = Array.from(root.windows).filter(win => win.id !== data.window.id).concat([data.window]);
+    root.windows = Array.from(root.windows).map(win => {
+      if (data.window.is_focused)
+        win.is_focused = false;
+      return win;
+    }).filter(win => win.id !== data.window.id).concat([data.window]);
   }
   function eventWindowClosed(data) {
     root.windows = Array.from(root.windows).filter(win => win.id !== data.id);
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
new file mode 100644
index 00000000..3c524955
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
@@ -0,0 +1,8 @@
+import Custom as Custom
+
+Custom.FileSelector {
+  id: root
+
+  directory: @wallpapers@
+  epoch: 72000000
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
index afed4bf0..55b1690e 100644
--- a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -17,13 +17,17 @@ Item {
     spacing: 0
 
     Repeater {
-      model: {
-        var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
-        trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
-        return trayItems;
+      model: ScriptModel {
+        values: {
+          var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
+          trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
+          return trayItems;
+        }
       }
 
       delegate: Item {
+        id: trayItemWrapper
+
         property var trayItem: modelData
         property string iconSource: {
           let icon = trayItem && trayItem.icon
@@ -47,17 +51,7 @@ Item {
         height: parent.height
         anchors.verticalCenter: parent.verticalCenter
 
-        IconImage {
-          anchors.centerIn: parent
-          width: parent.width
-          height: parent.width
-          source: parent.iconSource
-          asynchronous: true
-          smooth: true
-          mipmap: true
-        }
-
-        MouseArea {
+        WrapperMouseArea {
           id: trayItemArea
 
           anchors.fill: parent
@@ -88,21 +82,48 @@ Item {
               menuAnchor.open()
             }
           }
+
+          IconImage {
+            anchors.centerIn: parent
+            width: parent.width
+            height: parent.width
+            source: trayItemWrapper.iconSource
+            asynchronous: true
+            smooth: true
+            mipmap: true
+          }
         }
 
         PopupWindow {
+          id: tooltip
+
+          property bool nextVisible: (trayItem.tooltipTitle || trayItem.tooltipDescription) && (trayItemArea.containsMouse || tooltipMouseArea.containsMouse) && !menuAnchor.visible
+
           anchor {
             item: trayItemArea
             edges: Edges.Bottom
           }
-          visible: (trayItem.tooltipTitle || trayItem.tooltipDescription) && trayItemArea.containsMouse && !menuAnchor.visible
+
+          visible: false
+          onNextVisibleChanged: hangTimer.restart()
+
+          Timer {
+            id: hangTimer
+            interval: 100
+            onTriggered: tooltip.visible = tooltip.nextVisible
+          }
 
           color: "black"
 
           implicitWidth: Math.max(tooltipTitle.contentWidth, tooltipDescription.contentWidth) + 16
           implicitHeight: tooltipTitle.contentHeight + tooltipDescription.contentHeight + 16
 
-          WrapperItem {
+          WrapperMouseArea {
+            id: tooltipMouseArea
+
+            hoverEnabled: true
+            enabled: true
+
             margin: 8
 
             Column {
diff --git a/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
new file mode 100644
index 00000000..de31915f
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
@@ -0,0 +1,85 @@
+import QtQuick
+import Quickshell
+import qs.Services
+
+Item {
+  id: root
+
+  anchors.fill: parent
+
+  required property string screen
+
+  property Img current: one
+  property string source: selector.selected
+
+  WallpaperSelector {
+    id: selector
+    seed: screen
+  }
+
+  onSourceChanged: {
+    if (!source)
+      current = null;
+    else if (current === one)
+      two.update()
+    else
+      one.update()
+  }
+
+  Img { id: one }
+  Img { id: two }
+
+  component Img: Image {
+    id: img
+
+    function update() {
+      source = root.source || ""
+    }
+
+    anchors.fill: parent
+    fillMode: Image.PreserveAspectCrop
+    smooth: true
+    asynchronous: true
+    cache: false
+
+    opacity: 0
+
+    onStatusChanged: {
+      if (status === Image.Ready) {
+        root.current = this
+      }
+    }
+
+    states: State {
+      name: "visible"
+      when: root.current === img
+
+      PropertyChanges {
+        img.opacity: 1
+      }
+      StateChangeScript {
+        name: "unloadOther"
+        script: {
+          if (img === one)
+            two.source = ""
+          if (img === two)
+            one.source = ""
+        }
+      }
+    }
+
+    transitions: Transition {
+      SequentialAnimation {
+        NumberAnimation {
+          target: img
+          properties: "opacity"
+          duration: 5000
+          easing.type: Easing.OutCubic
+        }
+        ScriptAction {
+          scriptName: "unloadOther"
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
index 153c56bb..c8c017c3 100644
--- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -1,5 +1,8 @@
+import Quickshell
 import QtQuick
 import qs.Services
+import Quickshell.Widgets
+import QtQuick.Layouts
 
 Row {
   id: workspaces
@@ -11,61 +14,188 @@ Row {
   spacing: 0
 
   Repeater {
-    model: {
-      let currWorkspaces = NiriService.workspaces;
-      const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
-      currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
-      currWorkspaces.sort((a, b) => {
-        if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
-          return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
-        if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
-          return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
-        return a.idx - b.idx;
-      });
-      return currWorkspaces;
+    model: ScriptModel {
+      values: {
+        let currWorkspaces = NiriService.workspaces;
+        const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
+        currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
+        currWorkspaces.sort((a, b) => {
+          if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
+            return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
+          if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
+            return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
+          return a.idx - b.idx;
+        });
+        return currWorkspaces;
+      }
     }
 
-    Rectangle {
+    Item {
+      id: wsItem
+
       property var workspaceData: modelData
 
       width: wsLabel.contentWidth + 8
-      color: {
-        if (mouseArea.containsMouse) {
-          return "#33808080";
-        }
-        return "transparent";
-      }
       height: parent.height
       anchors.verticalCenter: parent.verticalCenter
 
-      MouseArea {
+      WrapperMouseArea {
         id: mouseArea
 
         anchors.fill: parent
+
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         enabled: true
         onClicked: {
           NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
         }
+
+        Rectangle {
+          anchors.fill: parent
+
+          color: {
+            if (mouseArea.containsMouse) {
+              return "#33808080";
+            }
+            return "transparent";
+          }
+
+          Text {
+            id: wsLabel
+
+            anchors.centerIn: parent
+
+            font.pointSize: 10
+            font.family: "Fira Sans"
+            color: {
+              if (workspaceData.is_active)
+                return "#23fd00";
+              if (workspaceData.active_window_id === null)
+                return "#555";
+              return "white";
+            }
+
+            text: workspaceData.name ? workspaceData.name : workspaceData.idx
+          }
+        }
       }
 
-      Text {
-        id: wsLabel
-
-        font.pointSize: 10
-        font.family: "Fira Sans"
-        color: {
-          if (workspaceData.is_active)
-            return "#23fd00";
-          if (workspaceData.active_window_id === null)
-            return "#555";
-          return "white";
+      PopupWindow {
+        id: tooltip
+
+        property bool nextVisible: (mouseArea.containsMouse || tooltipMouseArea.containsMouse) && [...windowsModel.values].length > 0
+
+        anchor {
+          item: mouseArea
+          edges: Edges.Bottom | Edges.Left
+        }
+        visible: false
+
+        onNextVisibleChanged: hangTimer.restart()
+
+        Timer {
+          id: hangTimer
+          interval: 100
+          onTriggered: tooltip.visible = tooltip.nextVisible
         }
-        anchors.centerIn: parent
 
-        text: workspaceData.name ? workspaceData.name : workspaceData.idx
+        implicitWidth: tooltipContent.implicitWidth
+        implicitHeight: tooltipContent.implicitHeight
+        color: "black"
+
+        WrapperMouseArea {
+          id: tooltipMouseArea
+
+          hoverEnabled: true
+          enabled: true
+
+          anchors.fill: parent
+
+          WrapperItem {
+            id: tooltipContent
+
+            margin: 0
+
+            ColumnLayout  {
+              spacing: 0
+
+              Repeater {
+                model: ScriptModel {
+                  id: windowsModel
+
+                  values: {
+                    let currWindows = Array.from(NiriService.windows).filter(win => win.workspace_id == wsItem.workspaceData.id);
+                    currWindows.sort((a, b) => {
+                      if (a.is_floating !== b.is_floating)
+                        return b.is_floating - a.is_floating;
+                      if (a.layout.tile_pos_in_workspace_view?.[0] !== b.layout.tile_pos_in_workspace_view?.[0])
+                        return a.layout.tile_pos_in_workspace_view?.[0] - b.layout.tile_pos_in_workspace_view?.[0]
+                      if (a.layout.tile_pos_in_workspace_view?.[1] !== b.layout.tile_pos_in_workspace_view?.[1])
+                        return a.layout.tile_pos_in_workspace_view?.[1] - b.layout.tile_pos_in_workspace_view?.[1]
+                      if (a.layout.pos_in_scrolling_layout?.[0] !== b.layout.pos_in_scrolling_layout?.[0])
+                        return a.layout.pos_in_scrolling_layout?.[0] - b.layout.pos_in_scrolling_layout?.[0]
+                      if (a.layout.pos_in_scrolling_layout?.[1] !== b.layout.pos_in_scrolling_layout?.[1])
+                        return a.layout.pos_in_scrolling_layout?.[1] - b.layout.pos_in_scrolling_layout?.[1]
+                      if (a.app_id !== b.app_id)
+                        return a.app_id.localeCompare(b.app_id);
+
+                      return a.title.localeCompare(b.title);
+                    });
+                    return currWindows;
+                  }
+                }
+
+                WrapperMouseArea {
+                  id: windowMouseArea
+
+                  property var windowData: modelData
+
+                  hoverEnabled: true
+                  cursorShape: Qt.PointingHandCursor
+                  enabled: true
+
+                  Layout.fillWidth: true
+
+                  onClicked: {
+                    NiriService.sendCommand({ "Action": { "FocusWindow": { "id": windowData.id } } }, _ => {})
+                  }
+
+                  WrapperRectangle {
+                    color: windowMouseArea.containsMouse ? "#33808080" : "transparent";
+
+                    anchors.fill: parent
+
+                    WrapperItem {
+                      anchors.fill: parent
+
+                      margin: 4
+
+                      Text {
+                        id: windowLabel
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+                        color: {
+                          if (windowData.is_focused)
+                            return "#23fd00";
+                          if (NiriService.workspaces.find(ws => ws.id == windowData.workspace_id)?.active_window_id == windowData.id)
+                            return "white";
+                          return "#555";
+                        }
+
+                        text: windowData.title
+
+                        horizontalAlignment: Text.AlignLeft
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/displaymanager.qml b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml
new file mode 100644
index 00000000..b452c03d
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml
@@ -0,0 +1,115 @@
+//@ pragma UseQApplication
+
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import Quickshell.Services.Greetd
+import QtQml
+
+
+ShellRoot {
+  id: displaymanager
+
+  settings.watchFiles: false
+
+  property string currentText: ""
+  property string username: @username@
+  property list<string> command: @niri_session@
+  property list<var> messages: []
+  property bool responseRequired: false
+  property bool responseVisible: false
+
+  signal startAuth()
+
+  onStartAuth: {
+    if (Greetd.state !== GreetdState.Inactive)
+      Greetd.cancelSession();
+    displaymanager.messages = [];
+    Greetd.createSession(displaymanager.username);
+  }
+
+  Connections {
+    target: Greetd
+    function onStateChanged() {
+      console.log("greetd state: ", GreetdState.toString(Greetd.state));
+      if (Greetd.state === GreetdState.ReadyToLaunch)
+        Greetd.launch(displaymanager.command);
+    }
+    function onAuthMessage(message: string, error: bool, responseRequired: bool, echoResponse: bool) {
+      displaymanager.responseVisible = echoResponse;
+      displaymanager.responseRequired = responseRequired;
+      displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": error }]);
+    }
+    function onAuthFailure(message: string) {
+      displaymanager.responseRequired = false;
+      displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": true }]);
+    }
+  }
+
+  Component.onCompleted: {
+    if (Greetd.state !== GreetdState.Inactive)
+      Greetd.cancelSession();
+  }
+
+  Variants {
+    model: Quickshell.screens
+
+    delegate: Scope {
+      id: screenScope
+
+      required property var modelData
+
+      PanelWindow {
+        color: "black"
+
+        screen: screenScope.modelData
+
+        WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+
+        anchors.top: true
+        anchors.bottom: true
+        anchors.left: true
+        anchors.right: true
+
+        LockSurface {
+          id: surfaceContent
+
+          screen: screenScope.modelData
+
+          onCurrentTextChanged: displaymanager.currentText = currentText
+          Connections {
+            target: displaymanager
+            function onCurrentTextChanged() { surfaceContent.currentText = displaymanager.currentText; }
+            function onMessagesChanged() { surfaceContent.messages = Array.from(displaymanager.messages); }
+            function onResponseRequiredChanged() { surfaceContent.responseRequired = displaymanager.responseRequired; }
+            function onResponseVisibleChanged() { surfaceContent.responseVisible = displaymanager.responseVisible; }
+          }
+
+          onResponse: responseText => Greetd.respond(responseText);
+          Connections {
+            target: Greetd
+            function onStateChanged() {
+              if (Greetd.state === GreetdState.Authenticating) {
+                surfaceContent.authRunning = true;
+              } else {
+                surfaceContent.authRunning = false;
+              }
+            }
+          }
+
+          onAuthRunningChanged: {
+            if (surfaceContent.authRunning && Greetd.state !== GreetdState.Authenticating)
+              displaymanager.startAuth();
+          }
+          Component.onCompleted: {
+            surfaceContent.authRunning = Greetd.state === GreetdState.Authenticating
+            surfaceContent.messages = Array.from(displaymanager.messages);
+            surfaceContent.responseVisible = displaymanager.responseVisible;
+            surfaceContent.responseRequired = displaymanager.responseRequired;
+            surfaceContent.currentText = displaymanager.currentText;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml
index 2abd1fef..1da9457d 100644
--- a/accounts/gkleen@sif/shell/quickshell/shell.qml
+++ b/accounts/gkleen@sif/shell/quickshell/shell.qml
@@ -1,6 +1,7 @@
 //@ pragma UseQApplication
 
 import Quickshell
+import Quickshell.Wayland
 
 ShellRoot {
   settings.watchFiles: false
@@ -8,8 +9,36 @@ ShellRoot {
   Variants {
     model: Quickshell.screens
 
-    delegate: Bar {
-      modelData: item
+    delegate: Scope {
+      id: screenScope
+
+      required property var modelData
+
+      PanelWindow {
+        id: bgWindow
+
+        screen: screenScope.modelData
+
+        WlrLayershell.layer: WlrLayer.Background
+        WlrLayershell.exclusionMode: ExclusionMode.Ignore
+
+        anchors.top: true
+        anchors.bottom: true
+        anchors.left: true
+        anchors.right: true
+
+        color: "black"
+
+        WallpaperBackground {
+          screen: bgWindow.screen.name
+        }
+      }
+
+      Bar {
+        screen: screenScope.modelData
+      }
     }
   }
+
+  Lockscreen {}
 }