From: Aidan <torrinfail@gmail.com>
Date: Wed, 12 Aug 2020 02:50:11 +0000 (-0600)
Subject: added blocks.def.h to act as default blocks file so that changes made in
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=7e0bc3f5801ba70fcf6d5824a74e29836b2d57b7;p=dwmblocks.git

added blocks.def.h to act as default blocks file so that changes made in
the future will not affect csutom blocks.h files.
---

diff --git a/.gitignore b/.gitignore
index c4bb970..b6605b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Custom blocks file
+blocks.h
+
 # Prerequisites
 *.d
 
diff --git a/Makefile b/Makefile
index ad7e701..bad5ddd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 PREFIX ?= /usr/local
-CC ?= cc
-output: dwmblocks.c blocks.h
-	${CC} dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
+
+output: dwmblocks.c blocks.def.h blocks.h
+	cc `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks
+blocks.h:
+	cp blocks.def.h $@
+
+
 clean:
 	rm -f *.o *.gch dwmblocks
 install: output
diff --git a/blocks.def.h b/blocks.def.h
new file mode 100644
index 0000000..35738db
--- /dev/null
+++ b/blocks.def.h
@@ -0,0 +1,10 @@
+//Modify this file to change what commands output to your statusbar, and recompile using the make command.
+static const Block blocks[] = {
+	/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
+	{"Mem:", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",	30,		0},
+
+	{"", "date '+%b %d (%a) %I:%M%p'",					5,		0},
+};
+
+//sets delimeter between status commands. NULL character ('\0') means no delimeter.
+static char delim = '|';
diff --git a/blocks.h b/blocks.h
deleted file mode 100644
index 31e98af..0000000
--- a/blocks.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//Modify this file to change what commands output to your statusbar, and recompile using the make command.
-static const Block blocks[] = {
-	/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
-	{"", "cat ~/.pacupdate | sed /📦0/d",					0,		9},
-	
-	{"🧠", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",	30,		0},
-
-	{"", "~/bin/statusbar/volume",						0,		10},
-
-	{"☀", "xbacklight | sed 's/\\..*//'",					0,		11},
-	
-	{"", "~/bin/statusbar/battery",						5,		0},
-
-	{"🌡", "sensors | awk '/^temp1:/{print $2}'",				5,		0},
-
-	{"", "~/bin/statusbar/clock",						5,		0},
-};
-
-//sets delimeter between status commands. NULL character ('\0') means no delimeter.
-static char delim = '|';