From 90421c49868b5c349306e727e36d95a9dc1c0c12 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 24 Feb 2025 19:30:54 -0500
Subject: [PATCH] chore(ags4): bump gtk4-layer-shell to 1.1.0

---
 modules/ags/default.nix                      |  8 +++++---
 modules/ags/gtk4/widgets/lockscreen/index.ts | 15 ++++-----------
 modules/ags/packages.nix                     |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/modules/ags/default.nix b/modules/ags/default.nix
index 73fe51cc..66cdd347 100644
--- a/modules/ags/default.nix
+++ b/modules/ags/default.nix
@@ -52,14 +52,16 @@ in {
     security.pam.services.astal-auth = {};
     services.upower.enable = true;
 
+    # FIXME: https://github.com/NixOS/nixpkgs/pull/377867
     nixpkgs.overlays = [
       (final: prev: {
-        gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (o: {
+        gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (o: rec {
+          version = "1.1.0";
           src = pkgs.fetchFromGitHub {
             owner = "wmww";
             repo = "gtk4-layer-shell";
-            rev = "e6c958189fcb78894d86db5beead1526084f8755";
-            hash = "sha256-QwOzgOJuf8K7v/aTDNw+hYRNa8TIel3Pac/cwCMU8zw=";
+            rev = "v${version}";
+            hash = "sha256-UGhFeaBBIfC4ToWdyoX+oUzLlqJsjF++9U7mtszE0y0=";
           };
         });
       })
diff --git a/modules/ags/gtk4/widgets/lockscreen/index.ts b/modules/ags/gtk4/widgets/lockscreen/index.ts
index 18cce3c2..4fb7a6a2 100644
--- a/modules/ags/gtk4/widgets/lockscreen/index.ts
+++ b/modules/ags/gtk4/widgets/lockscreen/index.ts
@@ -40,7 +40,7 @@ export default () => {
                     min-width ${transition_duration / 2}ms;
     }`;
 
-    const lock = Gtk4SessionLock.get_singleton();
+    const lock = Gtk4SessionLock.Instance.new();
 
     const unlock = () => {
         blurBGs.forEach((b) => {
@@ -57,7 +57,7 @@ export default () => {
             });
         });
         timeout(transition_duration, () => {
-            Gtk4SessionLock.unlock();
+            lock.unlock();
             Gdk.Display.get_default()?.sync();
             App.quit();
         });
@@ -222,21 +222,14 @@ export default () => {
             }
         });
 
-        Gtk4SessionLock.lock();
+        lock.lock();
 
         windows.forEach((win, monitor) => {
-            Gtk4SessionLock.assign_window_to_monitor(win, monitor);
+            lock.assign_window_to_monitor(win, monitor);
             win.show();
         });
     };
 
-    const on_finished = () => {
-        Gdk.Display.get_default()?.sync();
-        App.quit();
-    };
-
-    lock.connect('finished', on_finished);
-
     if (Vars.hasFprintd) {
         globalThis.authFinger = () => AstalAuth.Pam.authenticate('', (_, task) => {
             try {
diff --git a/modules/ags/packages.nix b/modules/ags/packages.nix
index acc0476c..64edbe2e 100644
--- a/modules/ags/packages.nix
+++ b/modules/ags/packages.nix
@@ -33,7 +33,7 @@ in {
       package = ags.packages.${pkgs.system}.ags.override {
         extraPackages = cfg.astalLibs;
 
-        # Make sure we use my overlayed version for gtk4-session-lock
+        # FIXME: this makes sure we use my overlayed version for gtk4-session-lock
         gtk4-layer-shell = pkgs.gtk4-layer-shell;
       };