modified dwm/config.def.h, modified dwmblocks/config.def.h, created dwmblocks/config.h

3 files changed, 79 insertions, 23 deletions

diff --git a/dwm/config.def.h b/dwm/config.def.h
index 73f5e11..92e4542 100644
--- a/dwm/config.def.h
+++ b/dwm/config.def.h
@@ -316,26 +316,6 @@ static Keychord *keychords[] = {
 	&((Keychord){3, {{WINKEY,	XK_t},{0,XK_b},{0, XK_t}},              togglebartitle,         {0} }),
 	&((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{ControlMask, XK_t}},    toggletopbar,           {0} }),
 
-  // AUDIO CONTROLS
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_d}},             spawn,                  SHCMD("mpdmenu && pkill -RTMIN+23 dwmblocks") }),
-  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_d}},             spawn,                  {.v = (const char *[]){ "dmenudelmusic", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_m}},             spawn,                  SHCMD("mpc random on; mpc load entire; mpc play && sleep 1 && mpc volume 50 && pkill -RTMIN+23 dwmblocks") }),
-  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_m}},             spawn,                  SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; sleep 1 && kill -39 $(pidof dwmblocks)") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_o}},             spawn,                  SHCMD("mpc repeat off; mpc random off; mpc single off") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_p}},             spawn,                  SHCMD("mpc pause; sleep 1 && pauseallmpv") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_r}},             spawn,                  SHCMD("mpc single off; mpc random on; mpc repeat on") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_s}},             spawn,                  SHCMD("mpc single on; mpc random on; mpc repeat on") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_t}},             spawn,                  SHCMD("mpc toggle") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_x}},             spawn,                  SHCMD("mpc stop; sleep 1 && mpc repeat off && mpc random off && mpc single off && mpc consume off && mpc clear") }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_comma}},         spawn,                  {.v = (const char *[]){ "mpc", "prev", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_period}},        spawn,                  {.v = (const char *[]){ "mpc", "next", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_comma}},         spawn,                  {.v = (const char *[]){ "mpc", "seek", "-10", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_period}},        spawn,                  {.v = (const char *[]){ "mpc", "seek", "+10", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{ControlMask, XK_comma}},         spawn,                  {.v = (const char *[]){ "mpc", "seek", "-60", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{ControlMask, XK_period}},        spawn,                  {.v = (const char *[]){ "mpc", "seek", "+60", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_bracketleft}},   spawn,                  {.v = (const char *[]){ "mpc", "seek", "0%", NULL } } }),
-  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_bracketright}},  spawn,                  {.v = (const char *[]){ "mpc", "seek", "90%", NULL } } }),
-
   // FLOATING POSITIONS
 	&((Keychord){2, {{WINKEY, XK_f},{0, XK_c}},                       movecenter,             {0} }),
 	&((Keychord){2, {{WINKEY, XK_f},{0, XK_m}},                       explace,                {.ui = EX_SW }}),
@@ -443,6 +423,26 @@ static Keychord *keychords[] = {
   &((Keychord){1, {{0, XF86XK_TouchpadOn}},                         spawn,                  {.v = (const char *[]){ "synclient", "TouchpadOff=0", NULL } } }),
   &((Keychord){1, {{0, XF86XK_TouchpadToggle}},                     spawn,                  SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") }),
 
+  // MUSIC CONTROLS
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_d}},             spawn,                  SHCMD("mpdmenu && pkill -RTMIN+23 dwmblocks") }),
+  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_d}},             spawn,                  {.v = (const char *[]){ "dmenudelmusic", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_m}},             spawn,                  SHCMD("mpc random on; mpc load entire; mpc play && sleep 1 && mpc volume 50 && pkill -RTMIN+23 dwmblocks") }),
+  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_m}},             spawn,                  SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; sleep 1 && kill -39 $(pidof dwmblocks)") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_o}},             spawn,                  SHCMD("mpc repeat off; mpc random off; mpc single off") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_p}},             spawn,                  SHCMD("mpc pause; sleep 1 && pauseallmpv") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_r}},             spawn,                  SHCMD("mpc single off; mpc random on; mpc repeat on") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_s}},             spawn,                  SHCMD("mpc single on; mpc random on; mpc repeat on") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_t}},             spawn,                  SHCMD("mpc toggle") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_x}},             spawn,                  SHCMD("mpc stop; sleep 1 && mpc repeat off && mpc random off && mpc single off && mpc consume off && mpc clear") }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_comma}},         spawn,                  {.v = (const char *[]){ "mpc", "prev", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_period}},        spawn,                  {.v = (const char *[]){ "mpc", "next", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_comma}},         spawn,                  {.v = (const char *[]){ "mpc", "seek", "-10", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{ShiftMask,   XK_period}},        spawn,                  {.v = (const char *[]){ "mpc", "seek", "+10", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{ControlMask, XK_comma}},         spawn,                  {.v = (const char *[]){ "mpc", "seek", "-60", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{ControlMask, XK_period}},        spawn,                  {.v = (const char *[]){ "mpc", "seek", "+60", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_bracketleft}},   spawn,                  {.v = (const char *[]){ "mpc", "seek", "0%", NULL } } }),
+  &((Keychord){2, {{WINKEY, XK_m},{0,           XK_bracketright}},  spawn,                  {.v = (const char *[]){ "mpc", "seek", "90%", NULL } } }),
+
   // MOUSE
   &((Keychord){1, {{ULTRAMOD, XK_j}},                               spawn,                  { .v = (const char *[]){ "xdotmouse", "h", NULL } } }),
   &((Keychord){1, {{ULTRAMOD, XK_k}},                               spawn,                  { .v = (const char *[]){ "xdotmouse", "j", NULL } } }),
@@ -584,13 +584,14 @@ static Keychord *keychords[] = {
 	&((Keychord){2, {{WINKEY, XK_s},{0, XK_x}},                       scratchpad_remove,      {0} }),
 	&((Keychord){2, {{WINKEY, XK_t},{0, XK_f}},                       togglefloating,         {0} }),
   &((Keychord){2, {{WINKEY, XK_t},{ControlMask, XK_f}},             togglecanfocusfloating, {0} }),
-  &((Keychord){2, {{WINKEY, XK_t},{0, XK_m}},                       togglemark,             {0} }),
+  &((Keychord){2, {{WINKEY, XK_t},{0, XK_m}},                       spawn,                  SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -40 $(pidof dwmblocks)") }),
   &((Keychord){2, {{WINKEY, XK_t},{0, XK_p}},                       togglescratch,          {.ui = 1 } }), // calculator //
   &((Keychord){2, {{WINKEY, XK_t},{0, XK_q}},                       toggleallowkill,        {0} }),
 	&((Keychord){2, {{WINKEY, XK_t},{0, XK_s}},                       togglesticky,           {0} }),
-	&((Keychord){2, {{WINKEY, XK_t},{0, XK_Tab}},                     toggleall,              {0} }),
+  &((Keychord){2, {{WINKEY, XK_t},{0, XK_apostrophe}},              togglemark,             {0} }),
 	&((Keychord){2, {{WINKEY, XK_t},{0, XK_space}},	                  togglealwaysontop,      {0} }),
-  &((Keychord){1, {{WINMOD2,  XK_Return}},                          togglescratch,          {.ui = 0 } }), // terminal //
+	&((Keychord){2, {{WINKEY, XK_t},{0, XK_Tab}},                     toggleall,              {0} }),
+  &((Keychord){1, {{WINMOD2, XK_Return}},                           togglescratch,          {.ui = 0 } }), // terminal //
 	&((Keychord){2, {{WINKEY, XK_t},{0, XK_1}},  	                    togglescratch,          {.ui = 0 } }),
 	&((Keychord){2, {{WINKEY, XK_t},{0, XK_2}},	                      togglescratch,          {.ui = 1 } }),
 	&((Keychord){2, {{WINKEY, XK_t},{0, XK_3}},	                      togglescratch,          {.ui = 2 } }),
diff --git a/dwmblocks/config.def.h b/dwmblocks/config.def.h
index 5cb2015..cffa5ab 100644
--- a/dwmblocks/config.def.h
+++ b/dwmblocks/config.def.h
@@ -34,6 +34,7 @@
   X("", "sb-bghitness", 0, 9)         \
   X("", "sb-brightness", 0, 8)        \
   X("", "sb-internet", 5, 7)          \
+  X("", "sb-mic", 0, 6)				        \
   X("", "sb-volume", 0, 5)            \
   X("", "sb-battery", 5, 4)           \
   X("", "sb-clock", 60, 3)            \
diff --git a/dwmblocks/config.h b/dwmblocks/config.h
new file mode 100644
index 0000000..cffa5ab
--- /dev/null
+++ b/dwmblocks/config.h
@@ -0,0 +1,54 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+// String used to delimit block outputs in the status.
+#define DELIMITER " "
+
+// Maximum number of Unicode characters that a block can output.
+#define MAX_BLOCK_OUTPUT_LENGTH 50
+
+// Control whether blocks are clickable.
+#define CLICKABLE_BLOCKS 1
+
+// Control whether a leading delimiter should be prepended to the status.
+#define LEADING_DELIMITER 0
+
+// Control whether a trailing delimiter should be appended to the status.
+#define TRAILING_DELIMITER 0
+
+// Define blocks for the status feed as X(icon, cmd, interval, signal).
+#define BLOCKS(X)\
+  X("", "sb-music", 0, 23)            \
+  X("", "sb-torrent", 0, 22)          \
+  X("", "sb-queues", 10, 21)          \
+  X("", "sb-mailbox", 300, 20)        \
+  X("", "sb-news", 0, 19)             \
+  X("", "sb-repos", 60, 18)           \
+  X("", "sb-tasks", 60, 17)           \
+  X("", "sb-packages", 0, 16)         \
+  X("", "sb-forecast", 10800, 15)     \
+  X("", "sb-cpu", 60, 13)             \
+  X("", "sb-memory", 60, 12)          \
+  X("", "sb-disk", 10800, 11)         \
+  X("", "sb-keyboard", 0, 10)         \
+  X("", "sb-bghitness", 0, 9)         \
+  X("", "sb-brightness", 0, 8)        \
+  X("", "sb-internet", 5, 7)          \
+  X("", "sb-mic", 0, 6)				        \
+  X("", "sb-volume", 0, 5)            \
+  X("", "sb-battery", 5, 4)           \
+  X("", "sb-clock", 60, 3)            \
+  X("", "sb-ecrypt", 0, 2)            \
+  X("", "sb-help-icon", 0, 1)
+
+  /* X("", "sb-price xmr-btc \"Monero to Bitcoin\" 🔒 30", 9000, 31)	  \ */
+  /* X("", "sb-price xmr Monero 🔒 29", 9000, 30)									    \ */
+  /* X("", "sb-price bnb Binance 🫧 28", 9000, 29)									    \ */
+  /* X("", "sb-price xrp XRP 🪓 27", 9000, 28)									        \ */
+  /* X("", "sb-price usdt Tether ⛺ 26", 9000, 27)									    \ */
+  /* X("", "sb-price eth Ethereum 🍸 25", 9000, 26)									  \ */
+  /* X("", "sb-price btc Bitcoin 💰 24", 9000, 25)									    \ */
+  /* X("", "sb-iplocate", 0, 6)				\ */
+
+#endif  // CONFIG_H
+