...quickshell

14 files changed, 656 insertions, 420 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 92163dca..c786c629 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -595,10 +595,10 @@ in {
             "--subst-var-by" "ksshaskpass" (lib.getExe pkgs.kdePackages.ksshaskpass)
           ];
         };
-        "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
-          [Unit]
-          After=graphical-session.target
-        '';
+        # "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
+        #   [Unit]
+        #   After=graphical-session.target
+        # '';
         "systemd/user/home-manager.service.d/before-graphical-session.conf".text = ''
           [Unit]
           Before=graphical-session-pre.target
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 35a3d799..e1eca4c4 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -231,25 +231,7 @@ in {
   };
 
   config = {
-    systemd.user.services.xwayland-satellite = {
-      Unit = {
-        BindsTo = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-        Requisite = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "notify";
-        NotifyAccess = "all";
-        Environment = [ "DISPLAY=:0" ];
-        ExecStart = ''${lib.getExe pkgs.xwayland-satellite-unstable} ''${DISPLAY}'';
-        ExecStartPre = "${systemctl} --user import-environment DISPLAY";
-        StandardOutput = "journal";
-      };
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-    };
+    home.packages = [ pkgs.xwayland-satellite-unstable ];
 
     services.swayidle = {
       events = [
diff --git a/accounts/gkleen@sif/shell/default.nix b/accounts/gkleen@sif/shell/default.nix
index 84140072..85e034d6 100644
--- a/accounts/gkleen@sif/shell/default.nix
+++ b/accounts/gkleen@sif/shell/default.nix
@@ -4,6 +4,18 @@
   config = {
     programs.quickshell = {
       enable = true;
+      package = pkgs.symlinkJoin {
+        pname = pkgs.quickshell.pname + "-wrapped";
+        inherit (pkgs.quickshell) version meta;
+        paths = [ pkgs.quickshell ];
+        buildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          for binary in quickshell qs; do
+            wrapProgram $out/bin/$binary \
+              --prefix QML_IMPORT_PATH : ${pkgs.qt6Packages.callPackage ./quickshell-plugins {}}/${pkgs.qt6.qtbase.qtQmlPrefix}
+          done
+        '';
+      };
       config = {
         src = ./quickshell;
         replacements = {
@@ -76,12 +88,20 @@
               runHook postBuild
             '';
           });
+          niri_session = builtins.toJSON [
+            (pkgs.writeShellScript "niri-session" ''
+              exec ${lib.getExe pkgs.dex} -w ${config.programs.niri.package}/share/wayland-sessions/niri.desktop &>/tmp/niri-session-$$.log
+            '')
+            # (lib.getExe pkgs.dex)
+            # "${config.programs.niri.package}/share/wayland-sessions/niri.desktop"
+          ];
+          username = builtins.toJSON config.home.username;
         };
       };
     };
     systemd.user.services.quickshell = {
       Service = {
-        Environment = "QML_IMPORT_PATH=${pkgs.qt6Packages.callPackage ./quickshell-plugins {}}/${pkgs.qt6.qtbase.qtQmlPrefix}";
+        RuntimeDirectory = "quickshell";
       };
     };
   };
diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index aab1607f..38225d74 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -7,8 +7,6 @@ PanelWindow {
 
   required property var screen
 
-  property var calendarMouseArea: clock.calendarMouseArea
-
   anchors {
     top: true
     left: true
@@ -80,8 +78,6 @@ PanelWindow {
       width: 4
     }
 
-    Clock {
-      id: clock
-    }
+    Clock {}
   }
 }
\ No newline at end of file
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index d0c9178b..382af168 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -22,18 +22,6 @@ Item {
     hoverEnabled: true
     enabled: clockItem.calendarPopup
 
-    property real angleRem: 0
-    property real sensitivity: 1 / 120
-
-    function scrollYear(event) {
-      angleRem += event.angleDelta.y;
-      const d = Math.round(angleRem * sensitivity);
-      yearCalendar.year += d;
-      angleRem -= d / sensitivity;
-    }
-
-    onWheel: event => scrollYear(event)
-
     Item {
       anchors.fill: parent
 
@@ -56,204 +44,233 @@ Item {
     }
   }
 
-  PopupWindow {
-    id: tooltip
+  Loader {
+    id: tooltipLoader
 
-    property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse
+    active: false
 
-    anchor {
-      item: clockMouseArea
-      edges: Edges.Bottom | Edges.Left
+    Connections {
+      target: clockMouseArea
+      function onContainsMouseChanged() {
+       if (clockMouseArea.containsMouse)
+         tooltipLoader.active = true;
+      }
     }
-    visible: false
 
-    onNextVisibleChanged: hangTimer.restart()
+    sourceComponent: PopupWindow {
+      id: tooltip
 
-    Timer {
-      id: hangTimer
-      interval: 100
-      onTriggered: tooltip.visible = tooltip.nextVisible
-    }
+      property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse
 
-    implicitWidth: clockTooltipContent.width
-    implicitHeight: clockTooltipContent.height
-    color: "black"
+      anchor {
+        item: clockMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
 
-    onVisibleChanged: {
-      yearCalendar.year = chrono.date.getFullYear();
-      clockMouseArea.angleRem = 0;
-    }
+      onNextVisibleChanged: hangTimer.restart()
 
-    WrapperMouseArea {
-      id: tooltipMouseArea
+      Timer {
+        id: hangTimer
+        interval: 100
+        onTriggered: tooltip.visible = tooltip.nextVisible
+      }
 
-      hoverEnabled: true
-      enabled: true
+      implicitWidth: clockTooltipContent.width
+      implicitHeight: clockTooltipContent.height
+      color: "black"
 
-      onWheel: event => clockMouseArea.scrollYear(event)
+      onVisibleChanged: {
+        yearCalendar.year = chrono.date.getFullYear();
+        yearCalendar.angleRem = 0;
+      }
 
-      anchors.fill: parent
+      WrapperMouseArea {
+        id: tooltipMouseArea
 
-      WrapperItem {
-        id: clockTooltipContent
+        hoverEnabled: true
+        enabled: true
 
-        margin: 8
-        leftMargin: 0
+        onWheel: event => yearCalendar.scrollYear(event)
 
-        ColumnLayout {
-          Text {
-            id: yearLabel
+        anchors.fill: parent
 
-            horizontalAlignment: Text.AlignHCenter
+        WrapperItem {
+          id: clockTooltipContent
 
-            font.pointSize: 14
-            font.family: "Fira Sans"
-            font.features: { "tnum": 1 }
-            color: "white"
+          margin: 8
+          leftMargin: 0
 
-            text: yearCalendar.year
+          ColumnLayout {
+            Text {
+              id: yearLabel
 
-            Layout.fillWidth: true
-            Layout.bottomMargin: 8
-          }
+              horizontalAlignment: Text.AlignHCenter
 
-          GridLayout {
-            property int year: chrono.date.getFullYear()
+              font.pointSize: 14
+              font.family: "Fira Sans"
+              font.features: { "tnum": 1 }
+              color: "white"
 
-            id: yearCalendar
+              text: yearCalendar.year
 
-            columns: 3
-            columnSpacing: 16
-            rowSpacing: 16
+              Layout.fillWidth: true
+              Layout.bottomMargin: 8
+            }
 
-            Layout.alignment: Qt.AlignHCenter
-            Layout.fillWidth: false
+            GridLayout {
+              property int year: chrono.date.getFullYear()
 
-            Repeater {
-              model: 12
+              id: yearCalendar
 
-              GridLayout {
-                columns: 2
+              columns: 3
+              columnSpacing: 16
+              rowSpacing: 16
 
-                required property int index
-                property int month: index
+              Layout.alignment: Qt.AlignHCenter
+              Layout.fillWidth: false
 
-                id: monthCalendar
+              property real angleRem: 0
+              property real sensitivity: 1 / 120
 
-                Layout.alignment: Qt.AlignTop | Qt.AlignRight
-                Layout.fillWidth: false
+              function scrollYear(event) {
+                angleRem += event.angleDelta.y;
+                const d = Math.round(angleRem * sensitivity);
+                yearCalendar.year += d;
+                angleRem -= d / sensitivity;
+              }
 
-                Text {
-                  Layout.column: 1
-                  Layout.fillWidth: true
+              Connections {
+                target: clockMouseArea
+                function onWheel(event) { yearCalendar.scrollYear(event); }
+              }
 
-                  horizontalAlignment: Text.AlignHCenter
+              Repeater {
+                model: 12
 
-                  font.pointSize: 10
-                  font.family: "Fira Sans"
+                GridLayout {
+                  columns: 2
 
-                  text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
+                  required property int index
+                  property int month: index
 
-                  color: "#ffead3"
-                }
+                  id: monthCalendar
 
-                DayOfWeekRow {
-                  locale: grid.locale
+                  Layout.alignment: Qt.AlignTop | Qt.AlignRight
+                  Layout.fillWidth: false
 
-                  Layout.row: 1
-                  Layout.column: 1
-                  Layout.fillWidth: true
+                  Text {
+                    Layout.column: 1
+                    Layout.fillWidth: true
 
-                  delegate: WrapperItem {
-                    required property string shortName
+                    horizontalAlignment: Text.AlignHCenter
 
-                    width: dowLabel.contentWidth + 6
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
 
-                    Text {
-                      id: dowLabel
+                    text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
 
-                      anchors.fill: parent
+                    color: "#ffead3"
+                  }
 
-                      font.pointSize: 10
-                      font.family: "Fira Sans"
+                  DayOfWeekRow {
+                    locale: grid.locale
 
-                      text: parent.shortName
-                      color: "#ffcc66"
+                    Layout.row: 1
+                    Layout.column: 1
+                    Layout.fillWidth: true
 
-                      horizontalAlignment: Text.AlignHCenter
-                      verticalAlignment: Text.AlignVCenter
-                    }
-                  }
-                }
+                    delegate: WrapperItem {
+                      required property string shortName
 
-                WeekNumberColumn {
-                  month: grid.month
-                  year: grid.year
-                  locale: grid.locale
+                      width: dowLabel.contentWidth + 6
 
-                  Layout.fillHeight: true
+                      Text {
+                        id: dowLabel
 
-                  delegate: Text {
-                    required property int weekNumber
+                        anchors.fill: parent
 
-                    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;
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
 
-                      isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
-                      if (dayOfWeek > 4) {
-                          isoWeekStart.setDate(isoWeekStart.getDate() + 7);
-                      }
+                        text: parent.shortName
+                        color: "#ffcc66"
 
-                      for (let i = 0; i < 7; i++) {
-                        const dayInWeek = new Date(isoWeekStart);
-                        dayInWeek.setDate(dayInWeek.getDate() + i);
-                        if (dayInWeek.getMonth() == monthCalendar.month)
-                          return 1;
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
                       }
-
-                      return 0;
                     }
+                  }
 
-                    font.pointSize: 10
-                    font.family: "Fira Sans"
-                    font.features: { "tnum": 1 }
-
-                    text: weekNumber
-                    color: "#99ffdd"
+                  WeekNumberColumn {
+                    month: grid.month
+                    year: grid.year
+                    locale: grid.locale
 
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                  }
-                }
+                    Layout.fillHeight: true
 
-                MonthGrid {
-                  id: grid
+                    delegate: Text {
+                      required property int weekNumber
 
-                  year: yearCalendar.year
-                  month: monthCalendar.month
-                  locale: Qt.locale("en_DK")
+                      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.fillWidth: true
-                  Layout.fillHeight: true
+                        isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
+                        if (dayOfWeek > 4) {
+                            isoWeekStart.setDate(isoWeekStart.getDate() + 7);
+                        }
 
-                  delegate: Text {
-                      required property var model
+                        for (let i = 0; i < 7; i++) {
+                          const dayInWeek = new Date(isoWeekStart);
+                          dayInWeek.setDate(dayInWeek.getDate() + i);
+                          if (dayInWeek.getMonth() == monthCalendar.month)
+                            return 1;
+                        }
 
-                      opacity: model.month === monthCalendar.month ? 1 : 0
+                        return 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"
+                      text: weekNumber
+                      color: "#99ffdd"
 
                       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
+
+                        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
+                    }
                   }
                 }
               }
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
index 7cb1cc67..cc82a275 100644
--- a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -2,14 +2,7 @@ import Quickshell
 import Quickshell.Wayland
 import Quickshell.Io
 import Quickshell.Services.Pam
-import Quickshell.Widgets
-import QtQuick.Effects
-import QtQuick.Layouts
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Controls.Fusion
-import qs.Services
-// import QtQml.Models
+import QtQml
 
 Scope {
   id: lockscreen
@@ -53,205 +46,30 @@ Scope {
     WlSessionLockSurface {
       id: lockSurface
 
-      color: "#000000"
+      color: "black"
 
-      Item {
-        id: background
+      LockSurface {
+        id: surfaceContent
 
-        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)
+        onResponse: responseText => pam.respond(responseText)
+        onAuthRunningChanged: {
+          if (authRunning)
+            pam.start();
         }
-
-        Clock {
-          anchors.centerIn: parent
-          calendarPopup: false
+        Connections {
+          target: pam
+          function onMessagesChanged() { surfaceContent.messages = pam.messages; }
+          function onResponseRequiredChanged() { surfaceContent.responseRequired = pam.responseRequired; }
+          function onActiveChanged() { surfaceContent.authRunning = pam.active; }
         }
-      }
-
-      WrapperRectangle {
-        id: unlockUi
-
-        Keys.onPressed: event => {
-          if (!pam.active) {
-            event.accepted = true;
-            pam.start();
-          }
+        onCurrentTextChanged: lockscreen.currentText = currentText
+        Connections {
+          target: lockscreen
+          function onCurrentTextChanged() { surfaceContent.currentText = lockscreen.currentText; }
         }
-        focus: !passwordBox.visible
-
-        visible: pam.active
-
-        color: Qt.rgba(0, 0, 0, 0.75)
-        margin: 8
-
-        anchors.centerIn: parent
-
-        ColumnLayout {
-          spacing: 4
-
-          BusyIndicator {
-            visible: running
-            running: !Array.from(pam.messages).length && !pam.responseRequired
-          }
-
-          Repeater {
-            model: pam.messages
-
-            Text {
-              required property var modelData
-
-              font.pointSize: 10
-              font.family: "Fira Sans"
-              color: modelData.error ? "#f28a21" : "#ffffff"
-
-              text: modelData.text
-
-              Layout.fillWidth: true
-              horizontalAlignment: Text.AlignHCenter
-            }
-          }
-
-          TextField {
-            id: passwordBox
-
-            visible: pam.responseRequired
-            echoMode: pam.responseVisible ? TextInput.Normal : TextInput.Password
-            inputMethodHints: Qt.ImhSensitiveData
-
-            onTextChanged: lockscreen.currentText = passwordBox.text
-            onAccepted: {
-              passwordBox.readOnly = true;
-              pam.respond(lockscreen.currentText);
-            }
-
-            Connections {
-              target: lockscreen
-              function onCurrentTextChanged() {
-                passwordBox.text = lockscreen.currentText
-              }
-            }
-            Connections {
-              target: pam
-              function onResponseRequiredChanged() {
-                if (pam.responseRequired)
-                  passwordBox.readOnly = false;
-                  passwordBox.focus = true;
-                  passwordBox.selectAll();
-              }
-            }
-
-            Layout.topMargin: 4
-            Layout.fillWidth: true
-          }
+        Connections {
+          target: lockSurface
+          function onScreenChanged() { surfaceContent.screen = lockSurface.screen; }
         }
       }
     }
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/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 1539126c..4543103f 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -351,8 +351,6 @@ in {
     xembed-sni-proxy = {
       Unit = {
         PartOf = lib.mkForce ["tray.target"];
-        BindsTo = ["xwayland-satellite.service"];
-        After = ["xwayland-satellite.service"];
       };
     };
     poweralertd = {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index bd85e472..952b95f9 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -655,7 +655,7 @@ in {
         "org.freedesktop.impl.portal.OpenFile" = ["gtk"];
         "org.freedesktop.impl.portal.Access" = ["gtk"];
         "org.freedesktop.impl.portal.Notification" = ["gtk"];
-        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        "org.freedesktop.impl.portal.Secret" = ["none"];
         "org.freedesktop.impl.portal.Inhibit" = ["none"];
       };
     };
diff --git a/hosts/sif/greetd/default.nix b/hosts/sif/greetd/default.nix
index 37ca13c5..081b6346 100644
--- a/hosts/sif/greetd/default.nix
+++ b/hosts/sif/greetd/default.nix
@@ -1,49 +1,92 @@
-{ pkgs, ... }:
-{
+{ config, pkgs, lib, flakeInputs, ... }:
+
+let
+  gkleenConfig = config.home-manager.users."gkleen";
+  toIni = lib.generators.toINI {
+    mkKeyValue =
+      key: value:
+      let
+        value' = if lib.isBool value then lib.boolToString value else toString value;
+      in
+      "${lib.escape [ "=" ] key}=${value'}";
+  };
+  toDconfIni = let
+    gvariant = import (flakeInputs.home-manager + "/modules/lib/gvariant.nix") { inherit lib; };
+    mkIniKeyValue = key: value: "${key}=${toString (gvariant.mkValue value)}";
+  in lib.generators.toINI { mkKeyValue = mkIniKeyValue; };
+in {
   config = {
     services.greetd = {
       enable = true;
-    #   settings.default_session.command = let
-    #     cfg = config.programs.regreet;
-    #   in pkgs.writeShellScript "greeter" ''
-    #       modprobe -r nvidia_drm
+      settings.default_session.command = lib.getExe (pkgs.writeShellApplication {
+        name = "sway";
+        runtimeInputs = [ pkgs.sway pkgs.fontconfig ];
+        runtimeEnv = {
+          XDG_DATA_DIRS = lib.makeSearchPath "share" [
+            pkgs.equilux-theme pkgs.paper-icon-theme pkgs.fira
+          ];
+          QT_PLUGIN_PATH = lib.makeSearchPath (pkgs.qt6.qtbase.qtPluginPrefix) [
+            pkgs.qt6Packages.qtbase
+          ];
+          QML2_IMPORT_PATH = lib.makeSearchPath (pkgs.qt6.qtbase.qtQmlPrefix) [
+            pkgs.qt6Packages.qtbase
+          ];
+          QT_QPA_PLATFORMTHEME = "gtk3";
+          XDG_CONFIG_DIR = pkgs.symlinkJoin {
+            name = "config";
+            paths = [
+              (pkgs.writeTextDir "gtk-3.0/settings.ini" (toIni {
+                Settings = {
+                  gtk-font-name = "Fira Sans 10";
+                  gtk-theme-name = "Equilux-compact";
+                  gtk-icon-theme-name = "Paper-Mono-Dark";
+                };
+              }))
+            ];
+          };
+          # XDG_CACHE_HOME = "/var/cache/greetd/greeter";
+          # XDG_CONFIG_HOME = "/var/cache/greetd/greeter/config";
+        };
+        text = ''
+          exec &>/tmp/sway-$$.log
+
+          unset MANAGERPID SYSTEMD_EXEC_PID
+
+          # ${lib.getExe' pkgs.coreutils "mkdir"} -p ''${XDG_CONFIG_HOME}/dconf
+          ${lib.getExe pkgs.dconf} load / < ${pkgs.writeText "dconf.ini" (toDconfIni {
+            "org/gnome/desktop/interface" = {
+              "color-scheme" = "prefer-dark";
+              "font-name" = "Fira Sans 10";
+              "gtk-theme" = "Equilux-compact";
+              "icon-theme" = "Paper-Mono-Dark";
+            };
+          })}
+
+          exec sway --unsupported-gpu --config ${pkgs.writeText "sway-config" ''
+            exec "${lib.getExe' config.systemd.package "systemctl"} --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; ${lib.getExe gkleenConfig.programs.quickshell.package} --path ${gkleenConfig.xdg.configFile."quickshell".source}/displaymanager.qml; swaymsg exit"
 
-    #       exec ${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}
-    #     '';
+            input type:keyboard {
+              xkb_layout "us,us"
+              xkb_variant "dvp,"
+              xkb_options "compose:caps,grp:win_space_toggle"
+            }
+
+            output eDP-1 scale 1.5
+          ''}
+        '';
+      });
     };
-    systemd.services.greetd.environment = {
-      XKB_DEFAULT_LAYOUT = "us,us";
-      XKB_DEFAULT_VARIANT = "dvp,";
-      XKB_DEFAULT_OPTIONS = "compose:caps,grp:win_space_toggle";
+
+    # security.pam.services.greetd.fprintAuth = false;
+
+    systemd.services.greetd.serviceConfig = {
+      ExecStartPre = ''${lib.getExe' pkgs.coreutils "install"} -d -o greeter -g greeter -m 0700 ''${CACHE_DIRECTORY}/greeter'';
+      # CacheDirectory = "greetd";
     };
-    programs.regreet = {
-      enable = true;
-      theme = {
-        package = pkgs.equilux-theme;
-        name = "Equilux-compact";
-      };
-      iconTheme = {
-        package = pkgs.paper-icon-theme;
-        name = "Paper-Mono-Dark";
-      };
-      font = {
-        package = pkgs.fira;
-        name = "Fira Sans";
-        # size = 6;
-      };
-      cageArgs = [ "-s" "-m" "last" ];
-      settings = {
-        GTK.application_prefer_dark_theme = true;
-        widget.clock.format = "%F %H:%M:%S%:z";
-        background = {
-          path = pkgs.runCommand "wallpaper.png" {
-            buildInputs = with pkgs; [ imagemagick ];
-          } ''
-            magick ${./wallpaper.png} -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$out"
-          '';
-          fit = "Cover";
-        };
-      };
+
+    users.users.greeter = {
+      home = "/var/lib/greeter";
+      createHome = true;
     };
   };
 }
diff --git a/hosts/sif/greetd/wallpaper.png b/hosts/sif/greetd/wallpaper.png
deleted file mode 100644
index 20fc761a..00000000
--- a/hosts/sif/greetd/wallpaper.png
+++ /dev/null
diff --git a/overlays/quickshell/default.nix b/overlays/quickshell/default.nix
new file mode 100644
index 00000000..ac722010
--- /dev/null
+++ b/overlays/quickshell/default.nix
@@ -0,0 +1,8 @@
+{ final, prev, ... }:
+{
+  quickshell = prev.quickshell.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or []) ++ [
+      ./greetd-response.patch
+    ];
+  });
+}
diff --git a/overlays/quickshell/greetd-response.patch b/overlays/quickshell/greetd-response.patch
new file mode 100644
index 00000000..a0efb562
--- /dev/null
+++ b/overlays/quickshell/greetd-response.patch
@@ -0,0 +1,16 @@
+diff --git c/src/services/greetd/connection.cpp w/src/services/greetd/connection.cpp
+index bf0d1fd..a790ab7 100644
+--- c/src/services/greetd/connection.cpp
++++ w/src/services/greetd/connection.cpp
+@@ -225,6 +225,11 @@ void GreetdConnection::onSocketReady() {
+ 
+                this->mResponseRequired = responseRequired;
+                emit this->authMessage(message, error, responseRequired, echoResponse);
++
++               if (!responseRequired)
++                       this->sendRequest({
++                               {"type", "post_auth_message_response"}
++                       });
+        } else goto unexpected;
+ 
+        return;