commit 7e0bc3f5801ba70fcf6d5824a74e29836b2d57b7
parent 8893f2d08aed826532fbb7a7b63e20c5bd938563
Author: Aidan <torrinfail@gmail.com>
Date: Tue, 11 Aug 2020 20:50:11 -0600
added blocks.def.h to act as default blocks file so that changes made in
the future will not affect csutom blocks.h files.
Diffstat:
4 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Custom blocks file
+blocks.h
+
# Prerequisites
*.d
diff --git 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
@@ -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
@@ -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 = '|';
