Updates dwm and dwmblocks

5 files changed, 9 insertions, 8 deletions

diff --git a/dwm/config.h b/dwm/config.h
index 4171b56..ced3d0e 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -280,8 +280,8 @@ static const Key keys[] = {
     { 0, XF86XK_TouchpadToggle,             spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
     { 0, XF86XK_TouchpadOff,                spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=1", NULL } } },
     { 0, XF86XK_TouchpadOn,                 spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=0", NULL } } },
-    { 0, XF86XK_MonBrightnessUp,            spawn, { .v = (const char *[]){ "sudo", "brillo", "-U", "5", "-q", NULL } } },
-    { 0, XF86XK_MonBrightnessDown,          spawn, { .v = (const char *[]){ "sudo", "brillo", "-A", "5", "-q", NULL } } },
+    { 0, XF86XK_MonBrightnessUp,            spawn, SHCMD("sudo brillo -U 5 -q; pkill -RTMIN+22 dwmblocks") },
+    { 0, XF86XK_MonBrightnessDown,          spawn, SHCMD("sudo brillo -A 5 -q; pkill -RTMIN+22 dwmblocks") },
 
     // MODE
     { MODKEY,                               XK_Escape,          setkeymode,         { .ui = ModeCommand } },
@@ -343,8 +343,8 @@ static const Key keys[] = {
     { MODKEY,                               XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
     { MODKEY | ShiftMask,                   XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
     { MODKEY | ShiftMask,                   XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
-    { MODKEY | ControlMask,                 XK_minus,           spawn,              { .v = (const char *[]){ "sudo", "brillo", "-U", "5", "-q", NULL } } },
-    { MODKEY | ControlMask,                 XK_equal,           spawn,              { .v = (const char *[]){ "sudo", "brillo", "-A", "5", "-q", NULL } } },
+    { MODKEY | ControlMask,                 XK_minus,           spawn,              SHCMD("sudo brillo -U 5 -q; pkill -RTMIN+22 dwmblocks") },
+    { MODKEY | ControlMask,                 XK_equal,           spawn,              SHCMD("sudo brillo -A 5 -q; pkill -RTMIN+22 dwmblocks") },
     { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; pkill -RTMIN+29 dwmblocks") },
     { ControlMask,                          XK_F5,              quit,               {1} },
     { ShiftMask | ControlMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
diff --git a/dwm/dwm b/dwm/dwm
index da88d54..7d04db5 100755
--- a/dwm/dwm
+++ b/dwm/dwm
diff --git a/dwm/thesiah.mom b/dwm/thesiah.mom
index 4785011..20102ed 100644
--- a/dwm/thesiah.mom
+++ b/dwm/thesiah.mom
@@ -266,9 +266,9 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWXF86TouchpadOn\fP \(en spawn {.v=(constchar*[]){"synclient","TouchpadOff=0",NULL}}
 .ITEM
-\f(CWXF86MonBrightnessUp\fP \(en spawn {.v=(constchar*[]){"sudo","brillo","-U","5","-q",NULL}}
+\f(CWXF86MonBrightnessUp\fP \(en spawn SHCMD("sudobrillo-U5-q;pkill-RTMIN+22dwmblocks")
 .ITEM
-\f(CWXF86MonBrightnessDown\fP \(en spawn {.v=(constchar*[]){"sudo","brillo","-A","5","-q",NULL}}
+\f(CWXF86MonBrightnessDown\fP \(en spawn SHCMD("sudobrillo-A5-q;pkill-RTMIN+22dwmblocks")
 .LIST OFF
 .HEADING 9 "Mode"
 .LI
@@ -384,9 +384,9 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+Shift+equal\fP \(en spawn SHCMD("wpctlset-volume@DEFAULT_AUDIO_SINK@15%+;kill-44$(pidofdwmblocks)")
 .ITEM
-\f(CWMOD+Ctrl+minus\fP \(en spawn {.v=(constchar*[]){"sudo","brillo","-U","5","-q",NULL}}
+\f(CWMOD+Ctrl+minus\fP \(en spawn SHCMD("sudobrillo-U5-q;pkill-RTMIN+22dwmblocks")
 .ITEM
-\f(CWMOD+Ctrl+equal\fP \(en spawn {.v=(constchar*[]){"sudo","brillo","-A","5","-q",NULL}}
+\f(CWMOD+Ctrl+equal\fP \(en spawn SHCMD("sudobrillo-A5-q;pkill-RTMIN+22dwmblocks")
 .ITEM
 \f(CWAlt_R\fP \(en spawn SHCMD("fcitx5-remote-t;pkill-RTMIN+29dwmblocks")
 .ITEM
diff --git a/dwmblocks/config.h b/dwmblocks/config.h
index 0b08d26..3db5249 100644
--- a/dwmblocks/config.h
+++ b/dwmblocks/config.h
@@ -19,6 +19,7 @@ static const Block blocks[] = {
     {"", "sb-disk", 10800, 20},
     // {"", "sb-nettraf", 1, 16},
     {"", "sb-volume", 0, 10},
+    {"", "sb-brightness", 0, 22},
     {"", "sb-battery", 5, 3},
     {"", "sb-inputs", 0, 29},
     /* {"",	"sb-moonphase",	18000,	17}, */
diff --git a/dwmblocks/dwmblocks b/dwmblocks/dwmblocks
index c358e4c..1e98b6b 100755
--- a/dwmblocks/dwmblocks
+++ b/dwmblocks/dwmblocks