6 files changed, 56 insertions, 13 deletions

diff --git a/accounts/gkleen@sif/niri.nix b/accounts/gkleen@sif/niri.nix
index b701b4c2..80abfc1a 100644
--- a/accounts/gkleen@sif/niri.nix
+++ b/accounts/gkleen@sif/niri.nix
@@ -711,6 +711,24 @@ in {
             (sleaf "match" { app-id = "^org\\.gnome\\.Papers$"; })
             (sleaf "default-column-display" "tabbed")
           ])
+          (plain "window-rule" [
+            (sleaf "match" { is-window-cast-target = true; })
+            (plain "border" [
+              (sleaf "width" 2)
+              (sleaf "active-gradient" {
+                from = "hsla(20 100% 45% 1)";
+                to = "hsla(340 100% 37.5% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+              (sleaf "inactive-gradient" {
+                from = "hsla(20 50% 27.7% 1)";
+                to = "hsla(340 50% 23% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+            ])
+          ])
 
           (plain "layer-rule" [
             (sleaf "match" { namespace = "^notifications$"; })
diff --git a/accounts/gkleen@sif/shell/default.nix b/accounts/gkleen@sif/shell/default.nix
index 44462865..18cec3fd 100644
--- a/accounts/gkleen@sif/shell/default.nix
+++ b/accounts/gkleen@sif/shell/default.nix
@@ -12,6 +12,7 @@
         postBuild = ''
           for binary in quickshell qs; do
             wrapProgram $out/bin/$binary \
+              --prefix QT_PLUGIN_PATH : ${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix} \
               --prefix QML_IMPORT_PATH : ${pkgs.qt6Packages.callPackage ./quickshell-plugins {}}/${pkgs.qt6.qtbase.qtQmlPrefix}
           done
         '';
@@ -63,6 +64,10 @@
                 url = "https://esawebb.org/media/archives/images/original/weic2425c.tif";
                 hash = "sha256-oaEOexSJHEGj090dJF3ct5HAoR+Y5gRiPrUlxdvnTRo=";
               })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2605c.tif";
+                hash = "sha256-IwWfgkz84LFXkfk77anb5e0Mf0wWiIszum7UC3yZn0U=";
+              })
             ];
 
             dontUnpack = true;
@@ -74,16 +79,17 @@
               typeset sources=($srcs)
 
               mkdir -p $out
-              magick ''${sources[0]} -crop 10000x5625+0+79 +repage -define jpeg:extent=10MB $out/carinanebula3.jpeg
-              magick ''${sources[1]} -crop 6716x3778+329+80 +repage -define jpeg:extent=10MB $out/pillarsofcreation_composite.jpeg
-              magick ''${sources[2]} -crop 10000x5625+0+79 +repage -define jpeg:extent=10MB $out/weic2212a.jpeg
-              magick ''${sources[3]} -crop 7650x4302+1166+389 +repage -define jpeg:extent=10MB $out/weic2415a.jpeg
-              magick ''${sources[4]} -crop 8732x4912+0+434 +repage -define jpeg:extent=10MB $out/weic2330a.jpeg
-              magick ''${sources[5]} -crop 5302x2982+636+0 +repage -define jpeg:extent=10MB $out/weic2426a.jpeg
-              magick ''${sources[6]} -crop 4328x2434+0+906 +repage -define jpeg:extent=10MB $out/weic2503a.jpeg
-              magick ''${sources[7]} -crop 4152x2335+0+666 +repage -define jpeg:extent=10MB $out/weic2506a.jpeg
-              magick ''${sources[8]} -crop 4320x2430+0+0 +repage -define jpeg:extent=10MB $out/weic2514a.jpeg
-              magick ''${sources[9]} -crop 5863x3298+0+477 +repage -define jpeg:extent=10MB $out/weic2425c.jpeg
+              magick ''${sources[0]} -crop 10000x5625+0+79 +repage -define webp:target-size=10000000 $out/carinanebula3.webp
+              magick ''${sources[1]} -crop 6716x3778+329+80 +repage -define webp:target-size=10000000 $out/pillarsofcreation_composite.webp
+              magick ''${sources[2]} -crop 10000x5625+0+79 +repage -define webp:target-size=10000000 $out/weic2212a.webp
+              magick ''${sources[3]} -crop 7650x4302+1166+389 +repage -define webp:target-size=10000000 $out/weic2415a.webp
+              magick ''${sources[4]} -crop 8732x4912+0+434 +repage -define webp:target-size=10000000 $out/weic2330a.webp
+              magick ''${sources[5]} -crop 5302x2982+636+0 +repage -define webp:target-size=10000000 $out/weic2426a.webp
+              magick ''${sources[6]} -crop 4328x2434+0+906 +repage -define webp:target-size=10000000 $out/weic2503a.webp
+              magick ''${sources[7]} -crop 4152x2335+0+666 +repage -define webp:target-size=10000000 $out/weic2506a.webp
+              magick ''${sources[8]} -crop 4320x2430+0+0 +repage -define webp:target-size=10000000 $out/weic2514a.webp
+              magick ''${sources[9]} -crop 5863x3298+0+477 +repage -define webp:target-size=10000000 $out/weic2425c.webp
+              magick ''${sources[10]} -crop 3990x2244+0+1379 +repage -define webp:target-size=10000000 $out/weic2605c.webp
 
               runHook postBuild
             '';
diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index 54ac2d3c..e8bd6245 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -32,8 +32,14 @@ PanelWindow {
   implicitHeight: 21
   color: "transparent"
 
+  property bool haveScreenshare: Array.from(NiriService.casts).some(cast => cast.target.Output?.name == bar.screen.name)
+
   Rectangle {
-    color: bar.haveMaximizedWindow ? "black" : Qt.rgba(0, 0, 0, 0.75)
+    color: {
+      if (bar.haveScreenshare)
+        return bar.haveMaximizedWindow ? Qt.rgba(0.2, 0, 0, 1) : Qt.rgba(0.2, 0, 0, 0.75);
+      return bar.haveMaximizedWindow ? "black" : Qt.rgba(0, 0, 0, 0.75);
+    }
     anchors.fill: parent
     // bottomLeftRadius: 8
     // bottomRightRadius: 8
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
index fc2e1f9f..30fa68b5 100644
--- a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -35,8 +35,11 @@ Scope {
     target: Custom.Systemd
     function onSleep(before: bool) {
       console.log(`received prepare for sleep ${before}`);
-      if (before)
+      if (before) {
         lock.locked = true;
+        if (pam.active)
+          pam.abort();
+      }
     }
     function onLock() { lock.locked = true; }
     function onUnlock() { lock.locked = false; }
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
index 6dbff134..cd4ed125 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -74,6 +74,10 @@ Singleton {
             eventWindowFocusTimestampChanged(event.WindowFocusTimestampChanged);
           else if (event.CastsChanged)
             root.casts = event.CastsChanged.casts
+          else if (event.CastStartedOrChanged)
+            eventCastStartedOrChanged(event.CastStartedOrChanged);
+          else if (event.CastStopped)
+            eventCastStopped(event.CastStopped);
           else if (event.Ok && !eventStreamSocket.acked) { eventStreamSocket.acked = true; }
           else if (event.OverviewOpenedOrClosed) {}
           else if (event.ConfigLoaded) {}
@@ -203,4 +207,10 @@ Singleton {
       return win;
     });
   }
+  function eventCastStartedOrChanged(data) {
+    root.casts = [...Array.from(root.casts).filter(cast => cast.stream_id !== data.cast.stream_id), data.cast];
+  }
+  function eventCastStopped(data) {
+    root.casts = Array.from(root.casts).filter(cast => cast.stream_id !== data.stream_id);
+  }
 }
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
index 3c524955..c71a9cca 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
@@ -4,5 +4,5 @@ Custom.FileSelector {
   id: root
 
   directory: @wallpapers@
-  epoch: 72000000
+  epoch: 79200000
 }