diff --git a/flake.lock b/flake.lock index 243abcde..9ea1e23b 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index db600794..852b4ffd 100644 Binary files a/flake.nix and b/flake.nix differ 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); - })} > 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; }; };