5 files changed, 13 insertions(+), 12 deletions(-)

M config.def.h
M config.h
M dwm
M dwm.c
M dwm.o

@@ 65,8 65,8 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont,
 static const char *termcmd[]  = { "st", NULL };
 static const char *webcmd[]  = { "firefox", NULL };
 static const char *lockcmd[] = { "slock", NULL };
-static const char *brupcmd[] = { "sudo", "light", "-A", "10", NULL };
-static const char *brdowncmd[] = { "sudo", "light", "-U", "10", NULL };
+static const char *brupcmd[] = { "doas", "light", "-A", "10", NULL };
+static const char *brdowncmd[] = { "doas", "light", "-U", "10", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */


@@ 74,7 74,7 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY|ShiftMask,             XK_o,      spawn,          {.v = webcmd } },
 	{ MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lockcmd } },
-	{ MODKEY|ShiftMask,             XK_s,      spawn,          SHCMD("slock & sudo zzz") },
+	{ MODKEY|ShiftMask,             XK_s,      spawn,          SHCMD("slock & doas zzz") },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },


@@ 108,9 108,9 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 	{ MODKEY|ControlMask|ShiftMask, XK_q,      quit,           {1} },
 	{ 0,                            XK_Print,  spawn,          SHCMD("scrot -a $(slop -f '%x,%y,%w,%h')") },
-	{ 0,                            XK_F2,     spawn,          SHCMD("amixer set Master playback 5%-") },
-	{ 0,                            XK_F3,     spawn,          SHCMD("amixer set Master playback 5%+") },
-	{ 0,                            XK_F4,     spawn,          SHCMD("amixer set Master playback toggle") },
+	{ 0,                            XF86XK_AudioLowerVolume,     spawn,          SHCMD("amixer set Master playback 5%-") },
+	{ 0,                            XF86XK_AudioRaiseVolume,     spawn,          SHCMD("amixer set Master playback 5%+") },
+	{ 0,                            XF86XK_AudioMute,     spawn,          SHCMD("amixer set Master playback toggle") },
   { 0,                            XK_F6,     spawn,          {.v = brupcmd} },
   { 0,                            XK_F5,     spawn,          {.v = brdowncmd} },
 };

@@ 65,8 65,8 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont,
 static const char *termcmd[]  = { "st", NULL };
 static const char *webcmd[]  = { "firefox", NULL };
 static const char *lockcmd[] = { "slock", NULL };
-static const char *brupcmd[] = { "sudo", "light", "-A", "10", NULL };
-static const char *brdowncmd[] = { "sudo", "light", "-U", "10", NULL };
+static const char *brupcmd[] = { "doas", "light", "-A", "10", NULL };
+static const char *brdowncmd[] = { "doas", "light", "-U", "10", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */


@@ 74,7 74,7 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY|ShiftMask,             XK_o,      spawn,          {.v = webcmd } },
 	{ MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lockcmd } },
-	{ MODKEY|ShiftMask,             XK_s,      spawn,          SHCMD("slock & sudo zzz") },
+	{ MODKEY|ShiftMask,             XK_s,      spawn,          SHCMD("slock & doas zzz") },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },


@@ 108,9 108,9 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 	{ MODKEY|ControlMask|ShiftMask, XK_q,      quit,           {1} },
 	{ 0,                            XK_Print,  spawn,          SHCMD("scrot -a $(slop -f '%x,%y,%w,%h')") },
-	{ 0,                            XK_F2,     spawn,          SHCMD("amixer set Master playback 5%-") },
-	{ 0,                            XK_F3,     spawn,          SHCMD("amixer set Master playback 5%+") },
-	{ 0,                            XK_F4,     spawn,          SHCMD("amixer set Master playback toggle") },
+	{ 0,                            XF86XK_AudioLowerVolume,     spawn,          SHCMD("amixer set Master playback 5%-") },
+	{ 0,                            XF86XK_AudioRaiseVolume,     spawn,          SHCMD("amixer set Master playback 5%+") },
+	{ 0,                            XF86XK_AudioMute,     spawn,          SHCMD("amixer set Master playback toggle") },
   { 0,                            XK_F6,     spawn,          {.v = brupcmd} },
   { 0,                            XK_F5,     spawn,          {.v = brdowncmd} },
 };

@@ 36,6 36,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
+#include <X11/XF86keysym.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */