From d563cdb1f6499d981901336bd0f86303ab95c4a5 Mon Sep 17 00:00:00 2001
From: DADA30000 <73874445+DADA30000@users.noreply.github.com>
Date: Fri, 20 Jun 2025 05:33:51 +0300
Subject: [PATCH] chore: Make wrapper as the default option (#1013)

* Make wrapper as the default option, clean up code a little

* Update docs
---
 README.md |  6 +++---
 flake.nix | 16 ++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3710558..4780a2b 100644
--- a/README.md
+++ b/README.md
@@ -194,7 +194,7 @@ Once you've set up the overlay, you can reference HyprPanel with `pkgs.hyprpanel
 # install it as a system package
 environment.systemPackages = with pkgs; [
   # ...
-  inputs.hyprpanel.packages.${pkgs.system}.wrapper # this one if you want to avoid overlays/didn't enable them
+  inputs.hyprpanel.packages.${pkgs.system}.default # this one if you want to avoid overlays/didn't enable them
   hyprpanel
   # ...
 ];
@@ -202,7 +202,7 @@ environment.systemPackages = with pkgs; [
 # or install it as a user package
 users.users.<username>.packages = with pkgs; [
   # ...
-  inputs.hyprpanel.packages.${pkgs.system}.wrapper # this one if you want to avoid overlays/didn't enable them
+  inputs.hyprpanel.packages.${pkgs.system}.default # this one if you want to avoid overlays/didn't enable them
   hyprpanel
   # ...
 ];
@@ -213,7 +213,7 @@ users.users.<username>.packages = with pkgs; [
 # install it as a user package with home-manager
 home.packages = with pkgs; [
   # ...
-  inputs.hyprpanel.packages.${pkgs.system}.wrapper # this one if you want to avoid overlays/didn't enable them
+  inputs.hyprpanel.packages.${pkgs.system}.default # this one if you want to avoid overlays/didn't enable them
   hyprpanel
   # ...
 ];
diff --git a/flake.nix b/flake.nix
index 3c97388..1d2f30a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,7 +119,7 @@
           pkgs = nixpkgs.legacyPackages.${system};
         in
         {
-          default = ags.lib.bundle {
+          unwrapped = ags.lib.bundle {
             inherit pkgs;
             src = ./.;
             name = "hyprpanel"; # name of executable
@@ -127,12 +127,15 @@
 
             extraPackages = packages system pkgs;
           };
+
+          default = self.packages.${pkgs.stdenv.system}.wrapper;
+
           # Make a wrapper package to avoid overlay
           wrapper = pkgs.writeShellScriptBin "hyprpanel" ''
             # Exporting glib-networking modules
             export GIO_EXTRA_MODULES="${pkgs.glib-networking}/lib/gio/modules"
             if [ "$#" -eq 0 ]; then
-                exec ${self.packages.${pkgs.stdenv.system}.default}/bin/hyprpanel
+                exec ${self.packages.${pkgs.stdenv.system}.unwrapped}/bin/hyprpanel
             else
                 exec ${ags.packages.${pkgs.stdenv.system}.io}/bin/astal -i hyprpanel "$@"
             fi
@@ -147,14 +150,7 @@
           pkgs = final;
         in
         {
-          hyprpanel = pkgs.writeShellScriptBin "hyprpanel" ''
-            export GIO_EXTRA_MODULES="${pkgs.glib-networking}/lib/gio/modules"
-            if [ "$#" -eq 0 ]; then
-              exec ${self.packages.${final.system}.default}/bin/hyprpanel
-            else
-              exec ${ags.packages.${final.system}.io}/bin/astal -i hyprpanel "$@"
-            fi
-          '';
+          hyprpanel = self.packages.${pkgs.stdenv.system}.wrapper;
         };
 
       homeManagerModules.hyprpanel = import ./nix/module.nix self;