From 9fed14cba50e218a0e7f488ee2e61d2c3839892c Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 5 Jan 2025 20:23:44 -0500
Subject: [PATCH] feat(ags4): add Kompass

---
 flake.lock                      | Bin 57226 -> 57888 bytes
 flake.nix                       | Bin 11835 -> 12029 bytes
 inputs/default.nix              |   7 +++++++
 lib/pkgs/mk-types/default.nix   |   2 +-
 modules/ags/gtk4/widget/bar.tsx |   4 +++-
 modules/ags/packages.nix        |  17 ++++++++++++++---
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 10cb67df97c381baa1d374d8aca551962a096059..20a27fc1fd9bbd177379e60f246f9f51374bd7c2 100644
GIT binary patch
delta 252
zcmeC$&%EFW^M;OCw(R`eg2dv<fhvlV-!r;PLAb?AI$R2Hpp;l#l9)5OahdjHd28{>
z^PPnz`v+RET3A{bSWe!^Bd6^gmgMh~TasUDR-RSm84+0)QtsmySWxI;nwjHPmF*Gf
zn_65LQCb$55;|E?Rg5z`za&4eq$o3g@<nw~cBqw;8!biD(h^fs4J`~Tl1!44%~K65
zERE9A(k#r3%}fkU4U;U4(+tckED|RhX!@WU0`tZ~X2Z=Lu?GW%VE(XDP=c9%Zj#LA
I$n}N>04q~g?f?J)

delta 18
acmZ2*gt==!^M;PtO$i4BH{ajrXaE3L9tj};

diff --git a/flake.nix b/flake.nix
index e01d18e8e0c611fe4fe79f5eaf0e1c3e92057456..699654f9403dbd9c8f2ba4e39a70976aeb2583e1 100644
GIT binary patch
delta 68
zcmdlT^EY<GV<EQe{M>@X;>iYl@)KhfC*R>TRm{#W$<He(%FNGGvgT3%gQC=ed<9zt
QC8*+yd}^B?3q?o+0Dq(yh5!Hn

delta 12
TcmewxyE|sXW1-DUg(IW^EvW_d

diff --git a/inputs/default.nix b/inputs/default.nix
index c62b03c3..c4075453 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -165,6 +165,13 @@ let
         inputs.astal.follows = "astal";
       };
 
+      kompass = mkInput {
+        owner = "kotontrion";
+        repo = "kompass";
+
+        inputs.astal.follows = "astal";
+      };
+
       gtk-session-lock = mkDep {
         owner = "Cu3PO42";
         repo = "gtk-session-lock";
diff --git a/lib/pkgs/mk-types/default.nix b/lib/pkgs/mk-types/default.nix
index 0932fbc7..6e789b98 100644
--- a/lib/pkgs/mk-types/default.nix
+++ b/lib/pkgs/mk-types/default.nix
@@ -11,7 +11,7 @@
   buildPhase = ''
     npx @ts-for-gir/cli generate \
     ${concatMapStringsSep "\n" (p: "    ${p.girName} \\") withGirNames}
-    ${concatMapStringsSep "\n" (p: "    -g ${p.package.dev}/share/gir-1.0 \\") withGirNames}
+    ${concatMapStringsSep "\n" (p: "    -g ${p.package.dev or p.package}/share/gir-1.0 \\") withGirNames}
         -g ${ts-for-gir-src}/girs \
         --ignoreVersionConflicts \
         -o ./types
diff --git a/modules/ags/gtk4/widget/bar.tsx b/modules/ags/gtk4/widget/bar.tsx
index 72077b0f..1f92569a 100644
--- a/modules/ags/gtk4/widget/bar.tsx
+++ b/modules/ags/gtk4/widget/bar.tsx
@@ -1,6 +1,8 @@
 import { App, Astal, Gtk } from 'astal/gtk4';
 import { Variable } from 'astal';
 
+import Kompass from 'gi://Kompass';
+
 import { Box, Button, Calendar, CenterBox, Label, MenuButton, Popover, Window } from './subclasses';
 
 const { EXCLUSIVE } = Astal.Exclusivity;
@@ -29,7 +31,7 @@ export default () => {
             application={App}
         >
             <CenterBox cssName="centerbox">
-                <Button onClicked="echo hi" />
+                <Kompass.Tray />
 
                 {styledBox}
 
diff --git a/modules/ags/packages.nix b/modules/ags/packages.nix
index 8383eecb..8c7ec3a4 100644
--- a/modules/ags/packages.nix
+++ b/modules/ags/packages.nix
@@ -5,9 +5,10 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.inputs) ags astal gtk-session-lock;
+  inherit (self.inputs) ags astal gtk-session-lock kompass;
 
   gtkSessionLock = gtk-session-lock.packages.${pkgs.system}.default;
+  libKompass = kompass.packages.${pkgs.system}.libkompass;
 
   inherit (lib) attrValues boolToString filter getExe mkIf optionalAttrs optionals;
 
@@ -55,7 +56,17 @@ in {
           wireplumber
           ;
 
-        inherit gtkSessionLock;
+        inherit
+          gtkSessionLock
+          libKompass
+          ;
+
+        # libkompass dependencies
+        inherit
+          (astal.packages.${pkgs.system})
+          cava
+          river
+          ;
 
         inherit
           (pkgs)
@@ -122,7 +133,7 @@ in {
           pname = "ags";
           configPath = "${cfg.configDir}/@girs";
           packages = filter (x:
-            x.pname != "libadwaita")
+            x.pname != "libadwaita" && x.pname != "libkompass")
           cfg.astalLibs;
         })
         // (buildGirTypes {