update

1 files changed, 27 insertions, 18 deletions

diff --git a/config.def.h b/config.def.h
index cabeb80..fc2c7a4 100644
--- a/config.def.h
+++ b/config.def.h
@@ -67,6 +67,15 @@ static const Layout layouts[] = {
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_base01, "-nf", col_base04, "-sb", col_base0D, "-sf", col_base00, NULL };
 static const char *termcmd[]  = { "alacritty", NULL };
+static const char *lower_volume_cmd[] = { "amixer set Master 5%-; kill -RTMIN+1 $(pidof -x sbar)", NULL };
+static const char *mutecmd[] = { "amixer set Master toggle; kill -RTMIN+1 $(pidof -x sbar)", NULL };
+static const char *nextcmd[] = { "playerctl next", NULL };
+static const char *playcmd[] = { "playerctl play-pause", NULL };
+static const char *prevcmd[] = { "playerctl previous", NULL };
+static const char *raise_volume_cmd[] = { "amixer set Master 5%+; kill -RTMIN+1 $(pidof -x sbar)", NULL };
+static const char *bright_up_cmd[] = { "backlight -u", NULL };
+static const char *bright_down_cmd[] = { "backlight -d", NULL };
+static const char *toggle_audio_capture_cmd[] = { "amixer set Capture toggle; kill -RTMIN $(pidof -x sbar)", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
@@ -104,26 +113,26 @@ static const Key keys[] = {
 	TAGKEYS(                        XK_8,                      7)
 	TAGKEYS(                        XK_9,                      8)
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-	{ MODKEY, XK_F2, spawn, SHCMD("amixer set Master 5%-; kill -RTMIN+1 $(pidof -x sbar)") },
-	{ MODKEY, XK_F1, spawn, SHCMD("amixer set Master toggle; kill -RTMIN+1 $(pidof -x sbar)") },
-	{ MODKEY, XK_F6, spawn, SHCMD("playerctl next") },
-	{ MODKEY, XK_F5, spawn, SHCMD("playerctl play-pause") },
-	{ MODKEY, XK_F4, spawn, SHCMD("playerctl previous") },
-	{ MODKEY, XK_F3, spawn, SHCMD("amixer set Master 5%+; kill -RTMIN+1 $(pidof -x sbar)") },
-	{ MODKEY, XK_F12, spawn, SHCMD("backlight -u") },
-	{ MODKEY, XK_F11, spawn, SHCMD("backlight -d") },
-	{ MODKEY|ShiftMask, XK_F1, spawn, SHCMD("amixer set Capture toggle; kill -RTMIN $(pidof -x sbar)") },
-	{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("amixer set Master 5%-; kill -RTMIN+1 $(pidof -x sbar)") },
-	{ 0, XF86XK_AudioMute, spawn, SHCMD("amixer set Master toggle; kill -RTMIN+1 $(pidof -x sbar)") },
-	{ 0, XF86XK_AudioNext, spawn, SHCMD("playerctl next") },
-	{ 0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") },
-	{ 0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") },
-	{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("amixer set Master 5%+; kill -RTMIN+1 $(pidof -x sbar)") },
-	{ 0, XF86XK_MonBrightnessUp, spawn, SHCMD("backlight -u") },
-	{ 0, XF86XK_MonBrightnessDown, spawn, SHCMD("backlight -d") },
+	{ MODKEY, XK_F2, spawn, {.v = lower_volume_cmd } },
+	{ MODKEY, XK_F1, spawn, {.v = mutecmd } },
+	{ MODKEY, XK_F6, spawn, {.v = nextcmd } },
+	{ MODKEY, XK_F5, spawn, {.v = playcmd } },
+	{ MODKEY, XK_F4, spawn, {.v = prevcmd } },
+	{ MODKEY, XK_F3, spawn, {.v = raise_volume_cmd } },
+	{ MODKEY, XK_F12, spawn, {.v = bright_up_cmd } },
+	{ MODKEY, XK_F11, spawn, {.v = bright_down_cmd } },
+	{ MODKEY|ShiftMask, XK_F1, spawn, {.v = toggle_audio_capture_cmd } },
+	{ 0, XF86XK_AudioLowerVolume, spawn, {.v = lower_volume_cmd } },
+	{ 0, XF86XK_AudioMute, spawn, {.v = mutecmd } },
+	{ 0, XF86XK_AudioNext, spawn, {.v = nextcmd } },
+	{ 0, XF86XK_AudioPlay, spawn, {.v = playcmd } },
+	{ 0, XF86XK_AudioPrev, spawn, {.v = prevcmd } },
+	{ 0, XF86XK_AudioRaiseVolume, spawn, {.v = raise_volume_cmd } },
+	{ 0, XF86XK_MonBrightnessUp, spawn, {.v = bright_up_cmd } },
+	{ 0, XF86XK_MonBrightnessDown, spawn, {.v = bright_down_cmd } },
 	// mod-shift-prtsc and mod-ctrl-prtsc does not work well, maybe because of sysrq? but mod-prtsc works well tho
 	{ 0, XK_Print, spawn, SHCMD("ffmpeg -f x11grab -i \"$DISPLAY\" -vframes 1 \"$XDG_PICTURES_DIR/screenshots/$(time-uuid).jxl\" && notify-send 'Screenshot Finished'") },
-	{ MODKEY, XF86XK_AudioMute, spawn, SHCMD("amixer set Capture toggle; kill -RTMIN $(pidof -x sbar)") },
+	{ MODKEY, XF86XK_AudioMute, spawn, {.v = toggle_audio_capture_cmd } },
 	{ MODKEY, XK_g, spawn, SHCMD("xrectsel '%w %h %x %y' | xargs sh -c 'ffmpeg -f x11grab -s \"$1x$2\" -i \"$DISPLAY+$3,$4\" -vframes 1 \"$XDG_PICTURES_DIR/screenshots/$(time-uuid).jxl\"' shell && notify-send 'Screenshot Finished'") },
 	{ MODKEY, XK_n, spawn, SHCMD("dunstctl close") },
 	// `xsel -cb` because there's a small delay before reading password into clipboard, so clear it beforehand to prevent pasting old clipboard