Fix things

environments/river/home.nix

@@ -132,10 +132,11 @@ in {
       all_tags=$(((1 << 32) - 1))
       riverctl map normal Super 0 set-focused-tags "$all_tags"
       riverctl map normal Super+Shift 0 set-view-tags "$all_tags"
-
-      trap "systemctl --user stop river-session.target" INT TERM
-      sleep infinity
     '';
+    systemd.extraCommands = [
+      "trap 'systemctl --user stop river-session.target' INT TERM"
+      "sleep infinity"
+    ];
   };
 
   home.packages = with pkgs; [

modules/wm/ags/default.nix

@@ -21,6 +21,7 @@
     buildInputs =
       prev.buildInputs
       ++ [
+        pkgs.bash
         pkgs.libdbusmenu-gtk3
         inputs.astal-river.packages.x86_64-linux.default
         inputs.astal-auth.packages.x86_64-linux.default
@@ -52,8 +53,5 @@ in {
     Install = {WantedBy = [systemdTarget];};
   };
 
-  xdg.configFile."ags" = {
-    source = ./.;
-    recursive = true;
-  };
+  xdg.configFile."ags".source = ./.;
 }

modules/wm/ags/lockscreen.js

@@ -19,7 +19,7 @@ export const error = Variable(
 
 const auth = new AstalAuth.Pam();
 let lock;
-const windows = [];
+let windows = [];
 
 let hasInit = false;
 
@@ -111,6 +111,7 @@ function unlock() {
 		windows.forEach((w) => {
 			w.window.destroy();
 		});
+		windows = [];
 		lock = undefined;
 
 		Gdk.Display.get_default()?.sync();
@@ -171,11 +172,15 @@ const LoginBox = () =>
 export const LockWindow = () =>
 	new Gtk.Window({
 		child: Widget.Box({
+			hexpand: true,
+			vexpand: true,
 			children: [
 				Widget.Revealer({
-					reveal_child: isLocked.bind(),
+					reveal_child: false,
 					transition: "crossfade",
 					transition_duration: DELAY,
+					hexpand: true,
+					vexpand: true,
 					child: Widget.Box({
 						css: `
 							background-image: url("/home/${Utils.USER}/.cache/current-wallpaper");
@@ -183,14 +188,15 @@ export const LockWindow = () =>
 							background-size: cover;
 						`,
 						vertical: true,
+						hexpand: true,
+						vexpand: true,
 						child: LoginBox(),
 					}),
-				}),
-				// .on("realize", (self) =>
-				// 	Utils.idle(() => {
-				// 		self.reveal_child = true;
-				// 	}),
-				// ),
+				}).on("realize", (self) =>
+					Utils.idle(() => {
+						self.reveal_child = true;
+					}),
+				),
 			],
 		}),
 	});

modules/wm/ags/style.css

@@ -4,6 +4,10 @@
 	margin: 0;
 }
 
+window {
+	all: unset;
+}
+
 button {
 	all: unset;
 }