From a6c82c2148384296df1be6069f885c63e77ef111 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 1 Feb 2020 12:43:28 -0500 Subject: simplification for emojis --- blocks.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/blocks.h b/blocks.h index a0c04f7..49eeee7 100644 --- a/blocks.h +++ b/blocks.h @@ -1,12 +1,17 @@ //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 /tmp/recordingicon", 0, 9}, - {"📬 ", "find ~/.local/share/mail/*/INBOX/new -type f | wc -l", 0, 13}, - {"🔊 ", "amixer get Master | grep -o \"\\(\\[off\\]\\|[0-9]*%\\)\"", 0, 10}, - {"🔋 ", "sed \"s/$/%/\" /sys/class/power_supply/BAT?/capacity", 5, 12}, - {"🕗 ", "date '+%Y %b %d (%a) %I:%M%p'", 60, 0}, + /* {"", "cat /tmp/recordingicon", 0, 9}, */ + /* {"", "mpc status | grep -v ^volume | head -n 1", 0, 11}, */ + {"mail:", "find ~/.local/share/mail/*/INBOX/new -type f | wc -l", 0, 12}, + {"vol:", "amixer get Master | tail -n1 | sed -r 's/.*\\[(.*)%\\].*/\\1/'", 0, 10}, + {"bat:", "sed \"s/$/%/\" /sys/class/power_supply/BAT?/capacity", 5, 0}, + {"", "date '+%b %d (%a) %I:%M%p'", 60, 0}, + /* weather: 5 */ + /* news: 6 */ + /* torrent: 7 */ + /* packages: 8 */ }; //sets delimeter between status commands. NULL character ('\0') means no delimeter. -static char delim = ' '; +static char delim = '|'; -- cgit v1.2.3-13-gbd6f From 6bd2e845be1f4efe089ec3f4d0fea82c93a515bb Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 8 Feb 2020 09:43:28 -0500 Subject: use general scripts for statusbar --- README.md | 4 ++++ blocks.h | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0f7d41c..2d0590b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,10 @@ Modular status bar for dwm written in c. # modifying blocks The statusbar is made from text output from commandline programs. Blocks are added and removed by editing the blocks.h header file. +# Luke's bulid +I have dwmblocks read my preexisting scripts [here in my dotfiles repo](https://github.com/LukeSmithxyz/voidrice/tree/master/.local/bin/statusbar). +So if you want my build out of the box, download those and put them in your `$PATH`. +I do this to avoid redundancy in LARBS, both i3 and dwm use the same statusbar scripts. # signalling changes For example, the audio module has the update signal 10 by default. Thus, running `pkill -RTMIN+10 dwmblocks` will update it. diff --git a/blocks.h b/blocks.h index 49eeee7..d02e53f 100644 --- a/blocks.h +++ b/blocks.h @@ -2,15 +2,15 @@ static const Block blocks[] = { /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ /* {"", "cat /tmp/recordingicon", 0, 9}, */ - /* {"", "mpc status | grep -v ^volume | head -n 1", 0, 11}, */ - {"mail:", "find ~/.local/share/mail/*/INBOX/new -type f | wc -l", 0, 12}, - {"vol:", "amixer get Master | tail -n1 | sed -r 's/.*\\[(.*)%\\].*/\\1/'", 0, 10}, - {"bat:", "sed \"s/$/%/\" /sys/class/power_supply/BAT?/capacity", 5, 0}, - {"", "date '+%b %d (%a) %I:%M%p'", 60, 0}, - /* weather: 5 */ - /* news: 6 */ - /* torrent: 7 */ - /* packages: 8 */ + /* {"", "music", 0, 11}, */ + {"", "pacpackages", 0, 8}, + {"", "torrent", 20, 7}, + {"", "news", 0, 6}, + {"", "weather", 18000, 5}, + {"", "mailbox", 180, 12}, + {"", "volume", 0, 10}, + {"", "battery", 5, 0}, + {"", "clock", 60, 0}, }; //sets delimeter between status commands. NULL character ('\0') means no delimeter. -- cgit v1.2.3-13-gbd6f From b9e29ebe901e41e777aaa4be00b808ca655697cf Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 1 Mar 2020 07:01:56 -0500 Subject: blocks.h moved to config.h --- Makefile | 4 ++-- blocks.h | 17 ----------------- config.h | 19 +++++++++++++++++++ dwmblocks.c | 10 +++++----- 4 files changed, 26 insertions(+), 24 deletions(-) delete mode 100644 blocks.h create mode 100644 config.h diff --git a/Makefile b/Makefile index 05754f8..c2033ee 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ output: dwmblocks.o gcc dwmblocks.o -lX11 -o dwmblocks -dwmblocks.o: dwmblocks.c blocks.h - gcc -c -lX11 dwmblocks.c +dwmblocks.o: dwmblocks.c config.h + gcc -c -lX11 dwmblocks.c clean: rm *.o *.gch dwmblocks install: output diff --git a/blocks.h b/blocks.h deleted file mode 100644 index d02e53f..0000000 --- a/blocks.h +++ /dev/null @@ -1,17 +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 /tmp/recordingicon", 0, 9}, */ - /* {"", "music", 0, 11}, */ - {"", "pacpackages", 0, 8}, - {"", "torrent", 20, 7}, - {"", "news", 0, 6}, - {"", "weather", 18000, 5}, - {"", "mailbox", 180, 12}, - {"", "volume", 0, 10}, - {"", "battery", 5, 0}, - {"", "clock", 60, 0}, -}; - -//sets delimeter between status commands. NULL character ('\0') means no delimeter. -static char delim = '|'; diff --git a/config.h b/config.h new file mode 100644 index 0000000..90b77f7 --- /dev/null +++ b/config.h @@ -0,0 +1,19 @@ +//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 /tmp/recordingicon", 0, 9}, */ + /* {"", "music", 0, 11}, */ + {"", "pacpackages", 0, 8}, + {"", "crypto", 0, 13}, + {"", "torrent", 20, 7}, + {"", "news", 0, 6}, + /* {"", "moonphase", 18000, 5}, */ + {"", "weather", 18000, 5}, + {"", "mailbox", 180, 12}, + {"", "volume", 0, 10}, + {"", "battery", 5, 0}, + {"", "clock", 60, 0}, +}; + +//sets delimeter between status commands. NULL character ('\0') means no delimeter. +static char delim = '|'; diff --git a/dwmblocks.c b/dwmblocks.c index 2db3489..3b80dbc 100644 --- a/dwmblocks.c +++ b/dwmblocks.c @@ -25,7 +25,7 @@ void sighandler(int signum); void termhandler(int signum); -#include "blocks.h" +#include "config.h" static Display *dpy; static int screen; @@ -69,7 +69,7 @@ void getcmds(int time) { const Block* current; for(int i = 0; i < LENGTH(blocks); i++) - { + { current = blocks + i; if ((current->interval != 0 && time % current->interval == 0) || time == -1) getcmd(current,statusbar[i]); @@ -90,7 +90,7 @@ void getsigcmds(int signal) void setupsignals() { for(int i = 0; i < LENGTH(blocks); i++) - { + { if (blocks[i].signal > 0) signal(SIGRTMIN+blocks[i].signal, sighandler); } @@ -101,7 +101,7 @@ void getstatus(char *str) { int j = 0; for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++])) - { + { strcpy(str + j, statusbar[i]); } str[--j] = '\0'; @@ -157,7 +157,7 @@ void termhandler(int signum) int main(int argc, char** argv) { for(int i = 0; i < argc; i++) - { + { if (!strcmp("-d",argv[i])) delim = argv[++i][0]; } -- cgit v1.2.3-13-gbd6f