From 7c7b83654e34adbf5358a0e9794d559559057642 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 27 Dec 2024 01:27:33 -0500
Subject: [PATCH] fix(ags): use PR to fix types

---
 flake.lock                                    | Bin 57792 -> 57798 bytes
 flake.nix                                     | Bin 11994 -> 11997 bytes
 inputs/default.nix                            |   3 ++-
 lib/pkgs/default.nix                          |   2 ++
 modules/ags/config/widgets/bar/items/tray.tsx |   5 +----
 modules/ags/packages.nix                      |   3 +++
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 243abcded71694332a558d750c0717e45d948833..9ea1e23b55ebce85edd815a09b784aca2c732f3a 100644
GIT binary patch
delta 131
zcmX?bnEBXY<_)3jY(^Fa#-?VI7s|_OnTDIByBMWpr&Xn9goFo%q?(j?6lJBB`URO5
zhm?jEWMw+#hlhGslmtwEC?q~vK~!dP8HeEH+71piGh<_;Btzr0L<7Sl3v)}OM3Y1d
i6En-yG!rue)1*|(<difsV}r?pwLTzio69)7ZUO*0XeuuN

delta 135
zcmX?hnEAkA<_)3jYzCGF<_6}I8@uGRQk?S3wR2N)OiG<9O*6|4()}|mi}Ul!^PPhe
zO{$91e8a->O9OKfJq#u%x`|D0W0sm+%ONoNuLXyid743rk%^(XMWUgpp;>B@iD_z*
mnX#pri9xD?d9rCrvT>3{s>NhM0hP%OrWzovn`=2dZvp@&5iAA(

diff --git a/flake.nix b/flake.nix
index db600794189155c3d6da4e12de8cfff78abfb77c..852b4ffdb96863d1a4f948cb77037650f1ecb4c1 100644
GIT binary patch
delta 16
XcmcZ=dpCB23FBltVad&2j1zPLJf#K?

delta 15
WcmcZ`dn<N>3FE}g;+y>#`*i_3BL;8)

diff --git a/inputs/default.nix b/inputs/default.nix
index 6d3438c6..1be2a3f8 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -159,7 +159,8 @@ let
 
     agsInputs = {
       astal = mkDep {
-        owner = "Aylur";
+        # FIXME: https://github.com/Aylur/astal/pull/208
+        owner = "matt1432";
         repo = "astal";
       };
 
diff --git a/lib/pkgs/default.nix b/lib/pkgs/default.nix
index 6b1c701c..02b9d06d 100644
--- a/lib/pkgs/default.nix
+++ b/lib/pkgs/default.nix
@@ -44,6 +44,8 @@ in {
           then "Astal-3.0"
           else if package.pname == "astal4"
           then "Astal-4.0"
+          else if package.pname == "astal-powerprofiles"
+          then "AstalPowerProfiles-0.1"
           else if package.pname == "gtk4"
           then "Gtk-4.0"
           else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1";
diff --git a/modules/ags/config/widgets/bar/items/tray.tsx b/modules/ags/config/widgets/bar/items/tray.tsx
index 39ed6860..87ea5d19 100644
--- a/modules/ags/config/widgets/bar/items/tray.tsx
+++ b/modules/ags/config/widgets/bar/items/tray.tsx
@@ -22,11 +22,8 @@ const TrayItem = (item: AstalTray.TrayItem) => {
 
                 usePopover={false}
                 tooltipMarkup={bind(item, 'tooltipMarkup')}
+                actionGroup={bind(item, 'actionGroup').as((ag) => ['dbusmenu', ag])}
                 menuModel={bind(item, 'menuModel')}
-
-                setup={(self) => self.hook(item, 'notify::action-group', () => {
-                    self.insert_action_group('dbusmenu', item.actionGroup);
-                })}
             >
                 <icon gicon={bind(item, 'gicon')} />
             </menubutton>
diff --git a/modules/ags/packages.nix b/modules/ags/packages.nix
index ca5c0d39..ff2a5560 100644
--- a/modules/ags/packages.nix
+++ b/modules/ags/packages.nix
@@ -39,6 +39,7 @@ in {
           (ags.inputs.astal.packages.${pkgs.system})
           io
           astal3
+          astal4
           apps
           auth
           battery
@@ -48,6 +49,7 @@ in {
           mpris
           network
           notifd
+          powerprofiles
           tray
           wireplumber
           ;
@@ -135,6 +137,7 @@ in {
                 "skipLibCheck" = true;
                 "module" = "ES2022";
                 "lib" = ["ES2023"];
+                "noEmit" = true;
               };
             };