4 files changed, 66 insertions, 1 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
index 8e739359..e4f8e1c9 100644
--- a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -38,6 +38,38 @@ Scope {
     function getLocked(): bool { return lock.locked; }
   }
 
+  Connections {
+    target: Custom.Systemd
+    function onSleep(before: bool) {
+      console.log(`received prepare for sleep ${before}`);
+      if (before)
+        lock.locked = true;
+    }
+    function onLock() { lock.locked = true; }
+    function onUnlock() { lock.locked = false; }
+  }
+
+  IdleMonitor {
+    id: idleMonitor
+    enabled: !lock.secure
+    timeout: 600
+    respectInhibitors: true
+
+    onIsIdleChanged: {
+      if (idleMonitor.isIdle)
+        lock.locked = true;
+    }
+  }
+
+  Custom.SystemdInhibitor {
+    enabled: !lock.secure
+
+    what: Custom.SystemdInhibitorParams.Sleep
+    who: "quickshell"
+    why: "Lock session"
+    mode: Custom.SystemdInhibitorParams.Delay
+  }
+
   WlSessionLock {
     id: lock
 
@@ -56,6 +88,8 @@ Scope {
       }
     }
 
+    onSecureStateChanged: Custom.Systemd.lockedHint = lock.secure
+
     WlSessionLockSurface {
       id: lockSurface
 
diff --git a/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
new file mode 100644
index 00000000..faa77c3f
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
@@ -0,0 +1,30 @@
+import QtQml
+import Quickshell
+import Quickshell.Wayland
+import qs.Services
+import Custom as Custom
+
+Scope {
+  IdleMonitor {
+    id: idleMonitor30
+    timeout: 30
+
+    onIsIdleChanged: Custom.Systemd.setIdleHint(idleMonitor30.isIdle)
+  }
+  IdleMonitor {
+    id: idleMonitor540
+    timeout: 540
+
+    onIsIdleChanged: {
+      if (idleMonitor540.isIdle)
+        NiriService.sendCommand({ "Action": "PowerOffMonitors" });
+    }
+  }
+  Connections {
+    target: Custom.Systemd
+    function onSleep(before: bool) {
+      if (!before)
+        NiriService.sendCommand({ "Action": "PowerOnMonitors" });
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
index c8c017c3..4cbebcc9 100644
--- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -48,7 +48,7 @@ Row {
         cursorShape: Qt.PointingHandCursor
         enabled: true
         onClicked: {
-          NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
+          NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {});
         }
 
         Rectangle {
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml
index 0fa45f79..693d741f 100644
--- a/accounts/gkleen@sif/shell/quickshell/shell.qml
+++ b/accounts/gkleen@sif/shell/quickshell/shell.qml
@@ -41,6 +41,7 @@ ShellRoot {
   }
 
   Lockscreen {}
+  NiriIdle {}
 
   VolumeOSD {}
   BrightnessOSD {}