4 files changed, 19 insertions, 5 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/LockSurface.qml b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
index 18698725..f4f8f0cd 100644
--- a/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
+++ b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
@@ -110,7 +110,11 @@ Item {
             NumberAnimation {
               target: imageEffect
               properties: "opacity"
-              duration: 5000
+              duration: {
+                if (img === one && two.source == "" || img === two && one.source == "")
+                  return 0;
+                return 5000;
+              }
               easing.type: Easing.OutCubic
             }
             ScriptAction {
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
index e4f8e1c9..456baa98 100644
--- a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -70,6 +70,11 @@ Scope {
     mode: Custom.SystemdInhibitorParams.Delay
   }
 
+  Scope {
+    id: mprisProxy
+    property list<var> players: Mpris.players.values
+  }
+
   WlSessionLock {
     id: lock
 
@@ -78,8 +83,9 @@ Scope {
         pam.abort();
 
       if (locked) {
+        NiriService.sendCommand({ "Action": { "PowerOffMonitors": {} } });
         Custom.KeePassXC.lockAllDatabases();
-        Array.from(Mpris.players.values).forEach(player => {
+        Array.from(mprisProxy.players).forEach(player => {
           if (player.canPause && player.isPlaying)
             player.pause();
         });
diff --git a/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
index faa77c3f..d65711e2 100644
--- a/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
+++ b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
@@ -17,14 +17,14 @@ Scope {
 
     onIsIdleChanged: {
       if (idleMonitor540.isIdle)
-        NiriService.sendCommand({ "Action": "PowerOffMonitors" });
+        NiriService.sendCommand({ "Action": { "PowerOffMonitors": {} } });
     }
   }
   Connections {
     target: Custom.Systemd
     function onSleep(before: bool) {
       if (!before)
-        NiriService.sendCommand({ "Action": "PowerOnMonitors" });
+        NiriService.sendCommand({ "Action": { "PowerOnMonitors": {} } });
     }
   }
 }
diff --git a/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
index de31915f..4f85a900 100644
--- a/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
@@ -73,7 +73,11 @@ Item {
         NumberAnimation {
           target: img
           properties: "opacity"
-          duration: 5000
+          duration: {
+            if (img === one && two.source == "" || img === two && one.source == "")
+              return 0;
+            return 5000;
+          }
           easing.type: Easing.OutCubic
         }
         ScriptAction {