From 4ed41b1279beaef660f997b6e4c49721c06957c0 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Wed, 14 May 2025 06:24:05 -0500
Subject: [PATCH] wip

---
 flake.nix                      | 17 ++++----
 home-manager/home.nix          |  1 +
 packages/hyprpanel/default.nix | 76 +++++++++++++++++-----------------
 3 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/flake.nix b/flake.nix
index faef951..b8caf20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,11 +23,14 @@
     hyprpanel.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, home-manager, ags, astal, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, ags, astal, hyprpanel, ... } @ inputs:
     let
       lib = nixpkgs.lib;
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
+      hyprpanelOverlay = self: super: {
+        hyprpanel = super.callPackage hyprpanel { };
+      };
     in {
       packages.${system}.default = pkgs.stdenvNoCC.mkDerivation rec {
         name = "my-shell";
@@ -52,18 +55,18 @@
       specialArgs = { inherit inputs system; };
 			inherit system;
 			modules = [ 
-            ./nixos/configuration.nix 
-            { nixpkgs.overlays = [inputs.hyprpanel.overlay]; }
+            ./nixos/configuration.nix
+            {nixpkgs.overlays = [ inputs.hyprpanel.overlay ];}
       ];
 		};
 	};
 	homeConfigurations = {
 		biscuit = home-manager.lib.homeManagerConfiguration {
+      pkgs = import nixpkgs {
+            inherit system;
+            overlay = [ inputs.hyprpanel.overlay ];
+          };
       extraSpecialArgs = { inherit inputs system; };
-      overlays = [
-        inputs.hyprpanel.overlay
-      ];
-			inherit pkgs;
 			modules = [ ./home-manager/home.nix ];
 		};
 	};
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 35a6149..1113d22 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,6 +7,7 @@
     ../modules/terminal.nix
     ../packages/ags/default.nix
     ../packages/hyprland/default.nix
+    ../packages/hyprpanel/default.nix
     # /home/biscuit/Nixos/packages/hyprland/default.nix
   ];
 
diff --git a/packages/hyprpanel/default.nix b/packages/hyprpanel/default.nix
index 4cd1062..11a2dd7 100644
--- a/packages/hyprpanel/default.nix
+++ b/packages/hyprpanel/default.nix
@@ -25,7 +25,7 @@
 
     # Import a theme from './themes/*.json'.
     # Default: ""
-    theme = "gruvbox_split";
+    # theme = "gruvbox_split";
 
     # Override the final config with an arbitrary set.
     # Useful for overriding colors in your selected theme.
@@ -37,42 +37,42 @@
     # Configure bar layouts for monitors.
     # See 'https://hyprpanel.com/configuration/panel.html'.
     # Default: null
-    layout = {
-      "bar.layouts" = {
-        "0" = {
-          left = [ "dashboard" "workspaces" ];
-          middle = [ "media" ];
-          right = [ "volume" "systray" "notifications" ];
-        };
-      };
-    };
-
-    # Configure and theme almost all options from the GUI.
-    # Options that require '{}' or '[]' are not yet implemented,
-    # except for the layout above.
-    # See 'https://hyprpanel.com/configuration/settings.html'.
-    # Default: <same as gui>
-    settings = {
-      bar.launcher.autoDetectIcon = true;
-      bar.workspaces.show_icons = true;
-
-      menus.clock = {
-        time = {
-          military = true;
-          hideSeconds = true;
-        };
-        weather.unit = "metric";
-      };
-
-      menus.dashboard.directories.enabled = false;
-      menus.dashboard.stats.enable_gpu = true;
-
-      theme.bar.transparent = true;
-
-      theme.font = {
-        name = "CaskaydiaCove NF";
-        size = "16px";
-      };
-    };
+    # layout = {
+    #   "bar.layouts" = {
+    #     "0" = {
+    #       left = [ "dashboard" "workspaces" ];
+    #       middle = [ "media" ];
+    #       right = [ "volume" "systray" "notifications" ];
+    #     };
+    #   };
+    # };
+    #
+    # # Configure and theme almost all options from the GUI.
+    # # Options that require '{}' or '[]' are not yet implemented,
+    # # except for the layout above.
+    # # See 'https://hyprpanel.com/configuration/settings.html'.
+    # # Default: <same as gui>
+    # settings = {
+    #   bar.launcher.autoDetectIcon = true;
+    #   bar.workspaces.show_icons = true;
+    #
+    #   menus.clock = {
+    #     time = {
+    #       military = true;
+    #       hideSeconds = true;
+    #     };
+    #     weather.unit = "metric";
+    #   };
+    #
+    #   menus.dashboard.directories.enabled = false;
+    #   menus.dashboard.stats.enable_gpu = true;
+    #
+    #   theme.bar.transparent = true;
+    #
+    #   theme.font = {
+    #     name = "CaskaydiaCove NF";
+    #     size = "16px";
+    #   };
+    # };
   };
 }