From 9c0c93100e168cd5ec1d6a1bbb688eaa47923715 Mon Sep 17 00:00:00 2001
From: odweta <code.62rdl@aleeas.com>
Date: Tue, 26 May 2026 09:11:10 +0200
Subject: [PATCH] modularize dwmblocks

---
 dwmblocks/blocks.def.h            | 10 +++++-----
 dwmblocks/modules/status-battery  |  3 +++
 dwmblocks/modules/status-datetime |  3 +++
 dwmblocks/modules/status-music    |  3 +++
 dwmblocks/modules/status-network  |  3 +++
 dwmblocks/modules/status-volume   |  4 +---
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100755 dwmblocks/modules/status-battery
 create mode 100755 dwmblocks/modules/status-datetime
 create mode 100755 dwmblocks/modules/status-music
 create mode 100755 dwmblocks/modules/status-network

diff --git a/dwmblocks/blocks.def.h b/dwmblocks/blocks.def.h
index c897c1a..d878e71 100644
--- a/dwmblocks/blocks.def.h
+++ b/dwmblocks/blocks.def.h
@@ -2,11 +2,11 @@
 #define MODULE_ROOT "$HOME/.config/suckless/dwmblocks/modules/"
 static const Block blocks[] = {
     /*Icon*/    /*Command*/    /*Update Interval*/ /*Update Signal*/
-    {"", "mpc status | head -1",     0, 1},
-    {"net:", "nmcli n c", 10, 0},
-    {"b:", "cat /sys/class/power_supply/BAT0/capacity", 60, 0},
-    {"v:", MODULE_ROOT "status-volume", 0, 2},
-    {"", "date +'%a %b %d, %H:%M'", 60, 0},
+    {" ",    MODULE_ROOT "status-music",     0, 1},
+    {"net:", MODULE_ROOT "status-network",  10, 0},
+    {"bat:", MODULE_ROOT "status-battery",  60, 0},
+    {"vol:", MODULE_ROOT "status-volume",    0, 2},
+    {"",     MODULE_ROOT "status-datetime", 60, 0},
 };
 
 //sets delimiter between status commands. NULL character ('\0') means no delimiter.
diff --git a/dwmblocks/modules/status-battery b/dwmblocks/modules/status-battery
new file mode 100755
index 0000000..bb6c3f6
--- /dev/null
+++ b/dwmblocks/modules/status-battery
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cat /sys/class/power_supply/BAT0/capacity
diff --git a/dwmblocks/modules/status-datetime b/dwmblocks/modules/status-datetime
new file mode 100755
index 0000000..86109ef
--- /dev/null
+++ b/dwmblocks/modules/status-datetime
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+date +'%a %b %d, %H:%M '
diff --git a/dwmblocks/modules/status-music b/dwmblocks/modules/status-music
new file mode 100755
index 0000000..5eb875b
--- /dev/null
+++ b/dwmblocks/modules/status-music
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+mpc status | head -1
diff --git a/dwmblocks/modules/status-network b/dwmblocks/modules/status-network
new file mode 100755
index 0000000..51be68a
--- /dev/null
+++ b/dwmblocks/modules/status-network
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+nmcli n c
diff --git a/dwmblocks/modules/status-volume b/dwmblocks/modules/status-volume
index b43b4e2..7c6c0d6 100755
--- a/dwmblocks/modules/status-volume
+++ b/dwmblocks/modules/status-volume
@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
-VOL=$(wpctl get-volume @DEFAULT_SINK@ | awk -F ": " '{print $2}' | sed 's/1\./1/g' | sed 's/0\.//g')
-
-echo -n $VOL
+wpctl get-volume @DEFAULT_SINK@ | awk -F ": " '{print $2}' | sed 's/1\./1/g' | sed 's/0\.//g'