From 01ac3de3ff967d1505c0738fd90723576c77ec28 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Fri, 16 May 2025 06:34:55 -0500
Subject: [PATCH] added theme

---
 flake.nix                | 124 +++++++++++++++++++++++----------------
 packages/ags/default.nix |  39 +++++++-----
 packages/ags/epik-shell  |   1 +
 system/astal/default.nix |  18 +++---
 4 files changed, 112 insertions(+), 70 deletions(-)
 create mode 160000 packages/ags/epik-shell

diff --git a/flake.nix b/flake.nix
index a91d331..7e77b75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,58 +19,84 @@
     hyprpanel.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, home-manager, ags, astal, hyprpanel, ... } @ inputs:
-    let
-      lib = nixpkgs.lib;
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    ags,
+    astal,
+    hyprpanel,
+    ...
+  } @ inputs: let
+    lib = nixpkgs.lib;
+    system = "x86_64-linux";
+    pkgs = nixpkgs.legacyPackages.${system};
+  in {
+    # TODO: migrate to another nix file.
+    packages.${system}.default = pkgs.stdenv.mkDerivation {
+      pname = "marble";
+      src = ./marble;
+      dontUnpack = true;
 
-    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 
-          io 
-          hyprland 
-          apps
-          # hyprland
-        ];
-        installPhase = ''
-          mkdir -p $out/bin 
-          ags bundle app.ts $out/bin/${name}
-        '';
-      };
-      # END TODO
-
-  nixosConfigurations = {
-		biscuit = lib.nixosSystem {
-      specialArgs = { inherit inputs system; };
-			inherit system;
-			modules = [ 
-            ./nixos/configuration.nix
+      nativeBuildInputs = with pkgs; [
+        wrapGAppsHook
+        gobject-introspection
       ];
-		};
-	};
-	homeConfigurations = {
-		biscuit = home-manager.lib.homeManagerConfiguration {
-      pkgs = import nixpkgs {
+
+      buildInputs =
+        (with astal.packages.${system}; [
+          astal3
+          io
+          apps
+          battery
+          bluetooth
+          hyprland
+          mpris
+          network
+          notifd
+          powerprofiles
+          tray
+          wireplumber
+        ])
+        ++ (with pkgs; [
+          gjs
+        ]);
+
+      preFixup = ''
+        gappsWrapperArgs+=(
+          --prefix PATH : ${with pkgs;
+          lib.makeBinPath [
+            dart-sass
+            fzf
+          ]}
+        )
+      '';
+
+      installPhase = ''
+        mkdir -p $out/bin
+        install $src $out/bin/marble
+      '';
+    }; # END TODO
+
+    nixosConfigurations = {
+      biscuit = lib.nixosSystem {
+        specialArgs = {inherit inputs system;};
         inherit system;
-        overlays = [ inputs.hyprpanel.overlay ];
+        modules = [
+          ./nixos/configuration.nix
+        ];
       };
-      # inherit pkgs;
-      extraSpecialArgs = { inherit inputs system; };
-			modules = [ ./home-manager/home.nix ];
-		};
-	};
     };
+    homeConfigurations = {
+      biscuit = home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [inputs.hyprpanel.overlay];
+        };
+        # inherit pkgs;
+        extraSpecialArgs = {inherit inputs system;};
+        modules = [./home-manager/home.nix];
+      };
+    };
+  };
 }
diff --git a/packages/ags/default.nix b/packages/ags/default.nix
index 180dc6a..070de04 100644
--- a/packages/ags/default.nix
+++ b/packages/ags/default.nix
@@ -1,10 +1,15 @@
-{ inputs, pkgs, system, ... }: {
+{
+  inputs,
+  pkgs,
+  system,
+  ...
+}: {
   # add the home manager module
-  imports = [ 
-    inputs.ags.homeManagerModules.default 
+  imports = [
+    inputs.ags.homeManagerModules.default
     # inputs.astal.homeManagerModules.default
   ];
-  
+
   home.packages = [
     # inputs.astal.packages.${system}.default
   ];
@@ -16,16 +21,22 @@
     configDir = ./custom;
 
     # additional packages to add to gjs's runtime
-    extraPackages = with pkgs; [
-      inputs.ags.packages.${pkgs.system}.battery
-      inputs.ags.packages.${pkgs.system}.wireplumber
-      inputs.ags.packages.${pkgs.system}.hyprland
-      inputs.ags.packages.${pkgs.system}.mpris
-      inputs.ags.packages.${pkgs.system}.io
-      inputs.ags.packages.${pkgs.system}.network
-      inputs.ags.packages.${pkgs.system}.tray
-      inputs.ags.packages.${pkgs.system}.notifd
-      fzf
+    extraPackages = with inputs.ags.packages.${pkgs.system}; [
+      apps
+      auth
+      battery
+      bluetooth
+      hyprland
+      mpris
+      network
+      notifd
+      powerprofiles
+      tray
+      wireplumber
+
+      pkgs.fzf
+      pkgs.dart-sass
+      pkgs.esbuild
     ];
   };
   # programs.astal = {
diff --git a/packages/ags/epik-shell b/packages/ags/epik-shell
new file mode 160000
index 0000000..9002206
--- /dev/null
+++ b/packages/ags/epik-shell
@@ -0,0 +1 @@
+Subproject commit 9002206c8b15f65eedeb1185c97ff5358a881949
diff --git a/system/astal/default.nix b/system/astal/default.nix
index c9b1801..3b11404 100644
--- a/system/astal/default.nix
+++ b/system/astal/default.nix
@@ -1,15 +1,19 @@
-{ pkgs, inputs, system, ... }: {
+{
+  pkgs,
+  inputs,
+  system,
+  ...
+}: {
   # environment.systemPackages = with pkgs; [
-  #   astal.io 
-  #   astal.gjs 
+  #   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
+    pkgs.adw-gtk3
+    pkgs.colloid-icon-theme
+    pkgs.colloid-gtk-theme
     # inputs.astal.packages.${system}.apps
   ];
 }