fix: adjust waybar battery setting for battery life

This commit is contained in:
DACHXY 2025-04-22 20:46:14 +08:00
parent 6514de2117
commit cf0e399d92
4 changed files with 33 additions and 29 deletions

View file

@ -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

View file

@ -1,4 +1,4 @@
{ terminal }:
{ terminal, osConfig }:
let
terminalRun = "${terminal} -e";
in
@ -184,10 +184,14 @@ in
format = "{}";
on-click = "${terminalRun} cava";
};
battery = {
full-at = 80;
battery =
let
fullAt = if osConfig.services.tlp.enable then 80 else 96;
in
{
full-at = fullAt;
states = {
good = 80;
good = fullAt;
warning = 30;
critical = 15;
};

View file

@ -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;
};

View file

@ -12,7 +12,7 @@
../../modules/virtualization.nix
../../modules/wine.nix
../../modules/wireguard.nix
../../modules/battery-life.nix
# ../../modules/battery-life.nix
];
home-manager = {