From 5dce5bc67ecce450a313688c98691defb17b7a4d Mon Sep 17 00:00:00 2001
From: benvonh <benjaminvonsnarski@gmail.com>
Date: Thu, 2 Jan 2025 07:33:01 +1000
Subject: [PATCH] nix: Possibly remove systemd unit from HM module

---
 nix/module.nix | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/nix/module.nix b/nix/module.nix
index ca84fa2..8e2c825 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -334,7 +334,8 @@ in
       bar.workspaces.workspaces = mkIntOption 5;
       dummy = mkBoolOption true;
       hyprpanel.restartAgs = mkBoolOption true;
-      hyprpanel.restartCommand = mkStrOption "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel; ${package}/bin/hyprpanel";
+      # hyprpanel.restartCommand = mkStrOption "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel; ${package}/bin/hyprpanel";
+      hyprpanel.restartCommand = mkStrOption "${package}/bin/hyprpanel q; ${package}/bin/hyprpanel";
       menus.clock.time.hideSeconds = mkBoolOption false;
       menus.clock.time.military = mkBoolOption false;
       menus.clock.weather.enabled = mkBoolOption true;
@@ -581,7 +582,6 @@ in
       text = ''
         cd
         echo '------------- HyprPanel -------------'
-        echo 
         echo 'Please ignore the layout diff for now'
         echo '-------------------------------------'
         colordiff ${config.xdg.configFile.hyprpanel.target} \
@@ -615,7 +615,8 @@ in
     xdg.configFile.hyprpanel = {
       target = "hyprpanel/config.json";
       text = finalConfig;
-      onChange = "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel || true";
+      # onChange = "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel || true";
+      onChange = "${package}/bin/hyprpanel r";
     };
 
     xdg.configFile.hyprpanel-swap = {
@@ -623,23 +624,23 @@ in
       text = finalConfig;
     };
 
-    systemd.user.services = mkIf cfg.systemd.enable {
-      hyprpanel = {
-        Unit = {
-          Description = "A Bar/Panel for Hyprland with extensive customizability.";
-          Documentation = "https://hyprpanel.com";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session-pre.target" ];
-        };
-        Service = {
-          ExecStart = "${package}/bin/hyprpanel";
-          ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID";
-          Restart = "on-failure";
-          KillMode = "mixed";
-        };
-        Install = { WantedBy = [ "graphical-session.target" ]; };
-      };
-    };
+    # systemd.user.services = mkIf cfg.systemd.enable {
+    #   hyprpanel = {
+    #     Unit = {
+    #       Description = "A Bar/Panel for Hyprland with extensive customizability.";
+    #       Documentation = "https://hyprpanel.com";
+    #       PartOf = [ "graphical-session.target" ];
+    #       After = [ "graphical-session-pre.target" ];
+    #     };
+    #     Service = {
+    #       ExecStart = "${package}/bin/hyprpanel";
+    #       ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID";
+    #       Restart = "on-failure";
+    #       KillMode = "mixed";
+    #     };
+    #     Install = { WantedBy = [ "graphical-session.target" ]; };
+    #   };
+    # };
 
     wayland.windowManager.hyprland.settings.exec-once = mkIf cfg.hyprland.enable [ "${package}/bin/hyprpanel" ];
   };