From 4e1ad1c8f6dd1310287a5652e3ba4a2ed152ce62 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 19 Apr 2024 19:20:08 -0400
Subject: [PATCH] fix(gtk-session-lock): make types use correct @girs types

---
 .gitignore                                     | 2 +-
 modules/ags/config/ts/lockscreen/main.ts       | 1 -
 modules/ags/gtk-session-lock-types/default.nix | 8 +++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58de4ce..d475134 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.egg-info
 *.temp
 *node_modules/
-*types
+**/types
 *build/
 result*
 *config.js
diff --git a/modules/ags/config/ts/lockscreen/main.ts b/modules/ags/config/ts/lockscreen/main.ts
index a0d18b1..35f9c74 100644
--- a/modules/ags/config/ts/lockscreen/main.ts
+++ b/modules/ags/config/ts/lockscreen/main.ts
@@ -161,7 +161,6 @@ const createWindow = (monitor: Gdk.Monitor) => {
     const win = PasswordPrompt(monitor);
 
     windows.push(win);
-    // @ts-expect-error should be fine
     lock.new_surface(win, monitor);
     win.show();
 };
diff --git a/modules/ags/gtk-session-lock-types/default.nix b/modules/ags/gtk-session-lock-types/default.nix
index 9e8b97c..437fe56 100644
--- a/modules/ags/gtk-session-lock-types/default.nix
+++ b/modules/ags/gtk-session-lock-types/default.nix
@@ -27,6 +27,12 @@ buildNpmPackage {
       "-g ${gdk-pixbuf.dev}/share/gir-1.0"
       "-g ${harfbuzz.dev}/share/gir-1.0"
       "-g ${atk.dev}/share/gir-1.0"
-    ]} -o $out
+    ]} -e gjs -o ./types
+
+    mkdir -p $out
+    cp ./types/gtksessionlock* $out/
+
+    substituteInPlace $out/gtksessionlock* --replace-warn \
+      "from '." "from '@girs"
   '';
 }