diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 9edefea..38ec8a2 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -30,7 +30,6 @@ background {
 }
 # TIME
 label {
-#   monitor =
   text = $TIME
   color = rgb(255, 255, 255)
   font_size = 90
@@ -42,8 +41,7 @@ label {
 
 # Battery
 label {
-#   monitor =
-  text = cmd[update:1000] echo "󰁹 $(cat /sys/class/power_supply/BAT0/capacity)%"
+  text = cmd[update:1000] /home/nathan/.config/hypr/scripts/battery.sh
   color = rgb(255, 255, 255)
   font_size = 20
   font_family = $font
diff --git a/.config/hypr/scripts/battery.sh b/.config/hypr/scripts/battery.sh
new file mode 100755
index 0000000..399f382
--- /dev/null
+++ b/.config/hypr/scripts/battery.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Get current battery level
+battery_level=$(cat /sys/class/power_supply/BAT0/capacity)
+
+# Get current charging status
+charging_status=$(cat /sys/class/power_supply/BAT0/status)
+# Get current power supply type
+power_supply_type=$(cat /sys/class/power_supply/ADP1/online)
+
+# Create printable output
+if [ "$charging_status" = "Charging" ]; then
+    status="󰂄"
+else
+    # Get battery level in percentage
+    if [ "$battery_level" -ge 90 ]; then
+        status="󰁹"
+    elif [ "$battery_level" -ge 70 ]; then
+        status="󰂀"
+    elif [ "$battery_level" -ge 50 ]; then
+        status="󰁾"
+    elif [ "$battery_level" -ge 25 ]; then
+        status="󰁻"
+    else
+        status="󰂃"
+    fi
+fi
+
+# Print the output
+if [ "$power_supply_type" -eq 1 ]; then
+    echo "$status $battery_level%"
+else
+    echo "󰂁 $battery_level%"
+fi
\ No newline at end of file