From 6308f0034526ed71632d7de8d9c8d86a08d04a2f Mon Sep 17 00:00:00 2001
From: mark <mark@betalupi.com>
Date: Mon, 21 Aug 2023 19:53:40 -0700
Subject: [PATCH] Use acpi for battery

---
 README.md                    | 2 +-
 modules/battery/battery.fish | 8 --------
 modules/battery/util.lua     | 6 ++----
 modules/battery/widget.lua   | 2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100755 modules/battery/battery.fish

diff --git a/README.md b/README.md
index 62b7180..94d5e85 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Some features require extra tools. Tools each module requires are listed below.
 
  - Core: `fish`, `sox` (and plugins)
  - Backlight: `xbacklight`
- - Battery: `upower`
+ - Battery: `acpi`
  - Ibus: `ibus`
  - Launcher: `rofi`
  - Lock: `i3lock, imagemagick, scrot` or `lightdm` (For `dm-tool`), depending on configuration.
diff --git a/modules/battery/battery.fish b/modules/battery/battery.fish
deleted file mode 100755
index ddeeb98..0000000
--- a/modules/battery/battery.fish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/fish
-# returns battery percentage and status
-#	45%, discharging
-#	second parameter returns "fully" when fully charged. Since awesome only checks for "discharging," fixing that isn't necessary.
-
-echo \
-	(upower --show-info /org/freedesktop/UPower/devices/battery_BAT1 | grep percentage | grep -Po "(\d\d?\d?)%"), \
-	(upower --show-info /org/freedesktop/UPower/devices/battery_BAT1 | grep state | grep -Po "(?<=state:)\s*(\w*)" | xargs) \
diff --git a/modules/battery/util.lua b/modules/battery/util.lua
index aed464f..68cda28 100644
--- a/modules/battery/util.lua
+++ b/modules/battery/util.lua
@@ -1,13 +1,11 @@
 local battery = {}
 
-local script = conf_dir .. "modules/battery/battery.fish"
-
 battery.watch = function(timeout, callback, widget)
-	awful.widget.watch(script, timeout, callback, widget)
+	awful.widget.watch("acpi --battery", timeout, callback, widget)
 end
 
 battery.status = function(callback)
-	awful.spawn.easy_async(script, callback)
+	awful.spawn.easy_async("acpi --battery", callback)
 end
 
 return battery
diff --git a/modules/battery/widget.lua b/modules/battery/widget.lua
index def1478..37da78e 100755
--- a/modules/battery/widget.lua
+++ b/modules/battery/widget.lua
@@ -95,7 +95,7 @@ widget.update = function(stdout)
 	local batpec = string.match(stdout, "(%d?%d?%d)%%")
 	batpec = tonumber(string.format("% 3d", batpec))
 
-	local discharging = string.match(stdout, "discharging") or false
+	local discharging = string.match(stdout, "Discharging") or false
 
 	-- Handle low power notifications
 	if discharging then