From cf0e399d92048d66d8b6385d8bb9a81e56ba65b0 Mon Sep 17 00:00:00 2001
From: DACHXY <Danny10132024@gmail.com>
Date: Tue, 22 Apr 2025 20:46:14 +0800
Subject: [PATCH] fix: adjust waybar battery setting for battery life

---
 home/config/waybar/config.nix  |  4 +--
 home/config/waybar/modules.nix | 54 ++++++++++++++++++----------------
 home/user/hyprland.nix         |  2 +-
 system/dev/dn-lap/default.nix  |  2 +-
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/home/config/waybar/config.nix b/home/config/waybar/config.nix
index 8985f0f..9f123e3 100644
--- a/home/config/waybar/config.nix
+++ b/home/config/waybar/config.nix
@@ -1,6 +1,6 @@
-{ terminal }:
+{ terminal, osConfig }:
 let
-  modulesConfig = import ./modules.nix { inherit terminal; };
+  modulesConfig = import ./modules.nix { inherit terminal osConfig; };
 in
 map (dev: dev // modulesConfig) [
   # Monitor 1
diff --git a/home/config/waybar/modules.nix b/home/config/waybar/modules.nix
index b4d6df3..4f365e2 100644
--- a/home/config/waybar/modules.nix
+++ b/home/config/waybar/modules.nix
@@ -1,4 +1,4 @@
-{ terminal }:
+{ terminal, osConfig }:
 let
   terminalRun = "${terminal} -e";
 in
@@ -184,31 +184,35 @@ in
     format = "{}";
     on-click = "${terminalRun} cava";
   };
-  battery = {
-    full-at = 80;
-    states = {
-      good = 80;
-      warning = 30;
-      critical = 15;
+  battery =
+    let
+      fullAt = if osConfig.services.tlp.enable then 80 else 96;
+    in
+    {
+      full-at = fullAt;
+      states = {
+        good = fullAt;
+        warning = 30;
+        critical = 15;
+      };
+      format = "{icon} {capacity}%";
+      format-icons = [
+        "󰂎"
+        "󰁺"
+        "󰁻"
+        "󰁼"
+        "󰁽"
+        "󰁾"
+        "󰁿"
+        "󰂀"
+        "󰂁"
+        "󰂂"
+        "󰁹"
+      ];
+      format-charging = "󰂄 {capacity}%";
+      format-plugged = "󰂄 {capacity}%";
+      format-alt = "{icon} {time}";
     };
-    format = "{icon} {capacity}%";
-    format-icons = [
-      "󰂎"
-      "󰁺"
-      "󰁻"
-      "󰁼"
-      "󰁽"
-      "󰁾"
-      "󰁿"
-      "󰂀"
-      "󰂁"
-      "󰂂"
-      "󰁹"
-    ];
-    format-charging = "󰂄 {capacity}%";
-    format-plugged = "󰂄 {capacity}%";
-    format-alt = "{icon} {time}";
-  };
   network = {
     format = "{ifname}";
     format-wifi = "󰤨";
diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix
index 9afb94d..6aa6ecd 100644
--- a/home/user/hyprland.nix
+++ b/home/user/hyprland.nix
@@ -192,7 +192,7 @@ in
   programs.waybar = {
     enable = true;
     style = ../../home/config/waybar/style.css;
-    settings = import ../../home/config/waybar/config.nix { inherit terminal; };
+    settings = import ../../home/config/waybar/config.nix { inherit terminal osConfig; };
     systemd = {
       enable = true;
     };
diff --git a/system/dev/dn-lap/default.nix b/system/dev/dn-lap/default.nix
index 01d50a7..b89729a 100644
--- a/system/dev/dn-lap/default.nix
+++ b/system/dev/dn-lap/default.nix
@@ -12,7 +12,7 @@
     ../../modules/virtualization.nix
     ../../modules/wine.nix
     ../../modules/wireguard.nix
-    ../../modules/battery-life.nix
+    # ../../modules/battery-life.nix
   ];
 
   home-manager = {