From f2e9573384ae117ee93c3d5875bbbe561ed1a6f4 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Thu, 20 Nov 2025 23:46:08 +0100
Subject: [PATCH] waybar: replace custom battery with upower+poweralertd

---
 homeConfigurations/vinzenz/default.nix |  5 ++++-
 homeConfigurations/vinzenz/waybar.nix  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix
index 8082e10..a8a0d28 100644
--- a/homeConfigurations/vinzenz/default.nix
+++ b/homeConfigurations/vinzenz/default.nix
@@ -91,6 +91,9 @@
       "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
     };
 
-    services.trayscale.enable = true;
+    services = {
+      trayscale.enable = true;
+      poweralertd.enable = true;
+    };
   };
 }
diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix
index 73c0ef8..b04fd5b 100644
--- a/homeConfigurations/vinzenz/waybar.nix
+++ b/homeConfigurations/vinzenz/waybar.nix
@@ -11,8 +11,10 @@
 
   programs.waybar = {
     enable = true;
-    systemd.enable = true;
-    systemd.target = "graphical-session.target";
+    systemd = {
+      enable = true;
+      target = "graphical-session.target";
+    };
     style = lib.mkAfter (builtins.readFile ./waybar.css);
     settings = {
       mainBar = {
@@ -35,9 +37,9 @@
           "custom/swaync"
         ];
         modules-right = [
+          "group/system-tray"
           #"image"
           "group/status-infos"
-          "group/system-tray"
           "custom/wlogout"
         ];
 
@@ -56,12 +58,13 @@
         "group/status-infos" = {
           orientation = "inherit";
           modules = [
-            "battery"
             "custom/weather"
             "temperature"
             "cpu"
             "memory"
             "disk"
+            # "battery"
+            "upower"
           ];
         };
 
@@ -110,6 +113,9 @@
             on-scroll-down = "shift_up";
           };
         };
+        upower = {
+          icon-size = 14;
+        };
         battery = {
           format = "{capacity}% {icon}";
           format-icons = [