From 34400702a8c39727b079aa55b41e4bef1258d86c Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Fri, 16 May 2025 06:42:25 -0500
Subject: [PATCH] upd

---
 flake.nix                | 88 ++++++++++++++++++++--------------------
 modules/system.nix       |  1 +
 system/astal/default.nix |  6 ---
 system/theme/default.nix | 13 ++++++
 4 files changed, 58 insertions(+), 50 deletions(-)
 create mode 100644 system/theme/default.nix

diff --git a/flake.nix b/flake.nix
index 7e77b75..a0172ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,50 +33,50 @@
     pkgs = nixpkgs.legacyPackages.${system};
   in {
     # TODO: migrate to another nix file.
-    packages.${system}.default = pkgs.stdenv.mkDerivation {
-      pname = "marble";
-      src = ./marble;
-      dontUnpack = true;
-
-      nativeBuildInputs = with pkgs; [
-        wrapGAppsHook
-        gobject-introspection
-      ];
-
-      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
+    # packages.${system}.default = pkgs.stdenv.mkDerivation {
+    #   pname = "marble";
+    #   src = ./marble;
+    #   dontUnpack = true;
+    #
+    #   nativeBuildInputs = with pkgs; [
+    #     wrapGAppsHook
+    #     gobject-introspection
+    #   ];
+    #
+    #   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 {
diff --git a/modules/system.nix b/modules/system.nix
index 349fd6a..868c4f3 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -6,5 +6,6 @@
     ../system/fonts/default.nix
     ../system/cursor/default.nix
     ../system/development/default.nix
+    ../system/theme/default.nix
   ];
 }
diff --git a/system/astal/default.nix b/system/astal/default.nix
index 3b11404..7338a58 100644
--- a/system/astal/default.nix
+++ b/system/astal/default.nix
@@ -10,10 +10,4 @@
   #   astal.hyprland
   #   astal.apps
   # ];
-  environment.systemPackages = [
-    pkgs.adw-gtk3
-    pkgs.colloid-icon-theme
-    pkgs.colloid-gtk-theme
-    # inputs.astal.packages.${system}.apps
-  ];
 }
diff --git a/system/theme/default.nix b/system/theme/default.nix
new file mode 100644
index 0000000..97930a7
--- /dev/null
+++ b/system/theme/default.nix
@@ -0,0 +1,13 @@
+
+{
+  pkgs,
+  inputs,
+  system,
+  ...
+}: {
+  environment.systemPackages = [
+    pkgs.adw-gtk3
+    pkgs.colloid-icon-theme
+    pkgs.colloid-gtk-theme
+  ];
+}