From bb04a5d1fdde1a7a229e835afa0e8c884954b9ae Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Thu, 15 May 2025 19:14:42 -0500
Subject: [PATCH] (nix) astal

---
 flake.nix                | 50 +++++++++++++++++++++++-----------------
 system/astal/default.nix | 19 ++++++++++-----
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/flake.nix b/flake.nix
index ad24e7c..fe94697 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,27 +28,35 @@
     in {
     
       # TODO: migrate to another nix file.
-      # packages.${system}.default = pkgs.stdenvNoCC.mkDerivation rec {
-      #   name = "my-shell";
-      #   src = ./.;
-      #
-      #   nativeBuildInputs = [
-      #     ags.packages.${system}.default 
-      #     pkgs.wrapGAppsHook
-      #     pkgs.gobject-introspection
-      #   ];
-      #
-      #   buildInputs = with astal.packages.${system}; [
-      #     astal3 
-      #     astal-hyprland
-      #     io 
-      #     # hyprland
-      #   ];
-      #   installPhase = ''
-      #     mkdir -p $out/bin 
-      #     ags bundle app.ts $out/bin/${name}
-      #   '';
-      # };
+      packages.${system}.default = pkgs.stdenvNoCC.mkDerivation rec {
+        name = "my-shell";
+        src = ./.;
+
+        nativeBuildInputs = [
+          ags.packages.${system}.default 
+          pkgs.wrapGAppsHook
+          pkgs.gobject-introspection
+        ];
+
+        buildInputs = with astal.packages.${system}; [
+          astal3
+          io
+          apps
+          battery
+          bluetooth
+          hyprland
+          mpris
+          network
+          notifd
+          powerprofiles
+          tray
+          wireplumber
+        ];
+        installPhase = ''
+          mkdir -p $out/bin 
+          ags bundle app.ts $out/bin/${name}
+        '';
+      };
       # END TODO
 
   nixosConfigurations = {
diff --git a/system/astal/default.nix b/system/astal/default.nix
index 060138e..c9b1801 100644
--- a/system/astal/default.nix
+++ b/system/astal/default.nix
@@ -1,8 +1,15 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    astal.io 
-    astal.gjs 
-    astal.hyprland
-    astal.apps
+{ pkgs, inputs, system, ... }: {
+  # environment.systemPackages = with pkgs; [
+  #   astal.io 
+  #   astal.gjs 
+  #   astal.hyprland
+  #   astal.apps
+  # ];
+  environment.systemPackages = [
+    # inputs.astal.packages.${system}.default
+    # inputs.astal.packages.${system}.io
+    # inputs.astal.packages.${system}.gjs
+    # inputs.astal.packages.${system}.hyprland
+    # inputs.astal.packages.${system}.apps
   ];
 }