From 196178abe804a632ee7814bc6225fd9d508dea1a Mon Sep 17 00:00:00 2001
From: DarthMooMancer <dmm.dev@pm.me>
Date: Fri, 12 Sep 2025 23:14:12 -0400
Subject: [PATCH] adding bar directly to dwm through utils

---
 .config/suckless/dwm/Makefile |  2 +-
 .config/suckless/dwm/bar.c    | 26 --------------------------
 .config/suckless/dwm/bar.h    |  2 --
 .config/suckless/dwm/dwm.c    |  1 -
 .config/suckless/dwm/util.c   | 24 ++++++++++++++++++++++++
 .config/suckless/dwm/util.h   |  1 +
 6 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 .config/suckless/dwm/bar.c
 delete mode 100644 .config/suckless/dwm/bar.h

diff --git a/.config/suckless/dwm/Makefile b/.config/suckless/dwm/Makefile
index b43e09c..15f9e5b 100644
--- a/.config/suckless/dwm/Makefile
+++ b/.config/suckless/dwm/Makefile
@@ -4,7 +4,7 @@ CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700L
 CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2 ${CPPFLAGS}
 LDFLAGS  = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft
 
-SRC = bar.c drw.c dwm.c util.c
+SRC = drw.c dwm.c util.c
 OBJ = ${SRC:.c=.o}
 
 .c.o:
diff --git a/.config/suckless/dwm/bar.c b/.config/suckless/dwm/bar.c
deleted file mode 100644
index d60b858..0000000
--- a/.config/suckless/dwm/bar.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "bar.h"
-#include <stdio.h>
-
-const char* vol() {
-	static char buf[5];
-	float v;
-	FILE *fp = popen("wpctl get-volume @DEFAULT_AUDIO_SINK@", "r");
-	if (!fp || fscanf(fp, "Volume: %f", &v) != 1) return NULL;
-	pclose(fp);
-	snprintf(buf, sizeof(buf), "%d%%", (int)(v * 100));
-	return buf;
-}
-
-const char* age() {
-	static char buf[5];
-	int days;
-	FILE *fp = popen("sh -c 'echo $(( ( $(date +%s) - $(stat -c %W /) ) / 86400 ))'", "r");
-	if (!fp || fscanf(fp, "%d", &days) != 1) return NULL;
-	pclose(fp);
-	snprintf(buf, sizeof(buf), "%dd", days);
-	return buf;
-}
-
-void execute_bar(char *out, size_t len) {
-    snprintf(out, len, "V: %s  A: %s", vol(), age());
-}
diff --git a/.config/suckless/dwm/bar.h b/.config/suckless/dwm/bar.h
deleted file mode 100644
index b201371..0000000
--- a/.config/suckless/dwm/bar.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "util.h"
-void execute_bar(char *out, size_t len);
diff --git a/.config/suckless/dwm/dwm.c b/.config/suckless/dwm/dwm.c
index 2c23da0..cf88206 100644
--- a/.config/suckless/dwm/dwm.c
+++ b/.config/suckless/dwm/dwm.c
@@ -14,7 +14,6 @@
 #include <X11/Xutil.h>
 #include <X11/Xft/Xft.h>
 
-#include "bar.h"
 #include "drw.h"
 #include "util.h"
 
diff --git a/.config/suckless/dwm/util.c b/.config/suckless/dwm/util.c
index 526383a..8257975 100644
--- a/.config/suckless/dwm/util.c
+++ b/.config/suckless/dwm/util.c
@@ -5,6 +5,30 @@
 
 #include "util.h"
 
+const char* vol() {
+	static char buf[5];
+	float v;
+	FILE *fp = popen("wpctl get-volume @DEFAULT_AUDIO_SINK@", "r");
+	if (!fp || fscanf(fp, "Volume: %f", &v) != 1) return NULL;
+	pclose(fp);
+	snprintf(buf, sizeof(buf), "%d%%", (int)(v * 100));
+	return buf;
+}
+
+const char* age() {
+	static char buf[5];
+	int days;
+	FILE *fp = popen("sh -c 'echo $(( ( $(date +%s) - $(stat -c %W /) ) / 86400 ))'", "r");
+	if (!fp || fscanf(fp, "%d", &days) != 1) return NULL;
+	pclose(fp);
+	snprintf(buf, sizeof(buf), "%dd", days);
+	return buf;
+}
+
+void execute_bar(char *out, size_t len) {
+    snprintf(out, len, "V: %s  A: %s", vol(), age());
+}
+
 void die(const char *fmt, ...) {
 	va_list ap;
 
diff --git a/.config/suckless/dwm/util.h b/.config/suckless/dwm/util.h
index 1e5f789..f8c94a0 100644
--- a/.config/suckless/dwm/util.h
+++ b/.config/suckless/dwm/util.h
@@ -5,3 +5,4 @@
 
 void die(const char *fmt, ...);
 void *ecalloc(size_t nmemb, size_t size);
+void execute_bar(char *out, size_t len);