Cleaned up a bit, added and removed a comple commands.

2 files changed, 67 insertions, 55 deletions

diff --git a/config.h b/config.h
index 3abf273..2ce0546 100644
--- a/config.h
+++ b/config.h
@@ -47,9 +47,9 @@ static const int resizehints     = 0;    /* 1 means respect size hints in tiled
 static const int lockfullscreen  = 1; /* 1 will force focus on the fullscreen window */
 
 static const Layout layouts[] = {
-   /* symbol     arrange function */
-   { "[]=",      tile },    /* first entry is default */
-   { "><>",      NULL },    /* no layout function means floating behavior */
+   /* Symbol,    layout. */
+   { "[]=",      tile },    /* First entry is default. */
+   { "><>",      NULL },    /* No layout function means floating behavior. */
    { "[M]",      monocle },
 };
 
@@ -64,14 +64,16 @@ static const Layout layouts[] = {
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
-/* commands */
+/* Commands. */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", norm_bg_col, "-nf", norm_fg_col, "-sb", sel_bg_col, "-sf", sel_fg_col, NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, NULL };
 static const char *termcmd[]  = { "/home/c/.local/bin/launchers/term.sh", NULL };
 static const char *webcmd[]   = { "/home/c/.local/bin/launchers/web.sh", NULL };
-static const char *papercmd[] = { "/home/c/.local/bin/wallpaper.sh", NULL };
 static const char *passcmd[]  = { "/sbin/passmenu", NULL };
-static const char *emojicmd[] = { "/sbin/bemoji", NULL };
+static const char *bmkscmd[]  = { "/home/c/.local/bin/bmks", NULL };
+static const char *bmkaddcmd[]= { "/home/c/.local/bin/bmks", "dadd", NULL };
+
+static const char *papercmd[] = { "/home/c/.local/bin/wallpaper.sh", NULL };
 
 ResourcePref resources[] = {
    {"norm_bg_col",      STRING,  &norm_bg_col },
@@ -93,57 +95,67 @@ ResourcePref resources[] = {
 #include "movestack.c"
 
 static const Key keys[] = {
-   /* modifier                     key        function        argument */
+   /* Modifier,         key,        function,         argument. */
+
    /* Spawn commands. */
-   { MODKEY,                        XK_space,   spawn,            {.v = dmenucmd } },
-   { MODKEY,                        XK_Return,  spawn,            {.v = termcmd } },
-   { MODKEY,                        XK_w,       spawn,            {.v = webcmd } },
-   { MODKEY,                        XK_c,       spawn,            {.v = passcmd } },
-   { MODKEY,                        XK_e,       spawn,            {.v = emojicmd } },
-
-   { MODKEY,                        XK_p,       spawn,            {.v = papercmd } },
-   { MODKEY,                        XK_b,       togglebar,        {0} },
-   { MODKEY,                        XK_j,       focusstack,       {.i = +1 } },
-   { MODKEY,                        XK_k,       focusstack,       {.i = -1 } },
-   { MODKEY|ShiftMask,              XK_j,       movestack,        {.i = +1 } },
-   { MODKEY|ShiftMask,              XK_k,       movestack,        {.i = -1 } },
-   { MODKEY,                        XK_minus,   setgaps,          {.i = -5 } },
-   { MODKEY|ShiftMask,              XK_equal,   setgaps,          {.i = +5 } },
-   { MODKEY,                        XK_equal,   resetgaps,        {0} },
-   { MODKEY,                        XK_i,       incnmaster,       {.i = +1 } },
-   { MODKEY,                        XK_d,       incnmaster,       {.i = -1 } },
-   { MODKEY,                        XK_h,       setmfact,         {.f = -0.05} },
-   { MODKEY,                        XK_l,       setmfact,         {.f = +0.05} },
-   { MODKEY,                        XK_Tab,     view,             {0} },
-   { MODKEY,                        XK_q,       killclient,       {0} },
-   { MODKEY,                        XK_t,       setlayout,        {.v = &layouts[0]} },
-   { MODKEY,                        XK_m,       setlayout,        {.v = &layouts[2]} },
-   { MODKEY|ShiftMask,              XK_f,       togglefloating,   {0} },
-   { MODKEY,                        XK_f,       togglefullscr,    {0} },
-   { MODKEY,                        XK_0,       view,             {.ui = ~0 } },
-   { MODKEY|ShiftMask,              XK_0,       tag,              {.ui = ~0 } },
-   { MODKEY,                        XK_comma,   focusmon,         {.i = -1 } },
-   { MODKEY,                        XK_period,  focusmon,         {.i = +1 } },
-   { MODKEY|ShiftMask,              XK_comma,   tagmon,           {.i = -1 } },
-   { MODKEY|ShiftMask,              XK_period,  tagmon,           {.i = +1 } },
-   { MODKEY|ShiftMask,              XK_q,       quit,             {0} },
-
-   { 0, 0x1008ff13,                 spawn,                        SHCMD("/home/c/.local/bin/setvol.sh i") },
-   { 0, 0x1008ff11,                 spawn,                        SHCMD("/home/c/.local/bin/setvol.sh d") },
-   { 0, 0x1008ff12,                 spawn,                        SHCMD("/home/c/.local/bin/setvol.sh m") },
-
-   TAGKEYS(                         XK_1,                         0)
-   TAGKEYS(                         XK_2,                         1)
-   TAGKEYS(                         XK_3,                         2)
-   TAGKEYS(                         XK_4,                         3)
-   TAGKEYS(                         XK_5,                         4)
-   TAGKEYS(                         XK_6,                         5)
-   TAGKEYS(                         XK_7,                         6)
-   TAGKEYS(                         XK_8,                         7)
-   TAGKEYS(                         XK_9,                         8)
+   { MODKEY,            XK_space,   spawn,            {.v = dmenucmd } },
+   { MODKEY,            XK_Return,  spawn,            {.v = termcmd } },
+   { MODKEY,            XK_w,       spawn,            {.v = webcmd } },
+   { MODKEY,            XK_c,       spawn,            {.v = passcmd } },
+   { MODKEY,            XK_m,       spawn,            {.v = bmkscmd } },
+   { MODKEY|ShiftMask,  XK_m,       spawn,            {.v = bmkaddcmd } },
+
+   /* Window navigation. */
+   { MODKEY,            XK_j,       focusstack,       {.i = +1 } },
+   { MODKEY,            XK_k,       focusstack,       {.i = -1 } },
+   { MODKEY|ShiftMask,  XK_j,       movestack,        {.i = +1 } },
+   { MODKEY|ShiftMask,  XK_k,       movestack,        {.i = -1 } },
+   { MODKEY,            XK_i,       incnmaster,       {.i = +1 } },     /* Increase the number of master windows.  */
+   { MODKEY,            XK_d,       incnmaster,       {.i = -1 } },     /* Decrease the number of master windows.  */
+   { MODKEY,            XK_h,       setmfact,         {.f = -0.05} },   /* Increase master/stack ratio. */
+   { MODKEY,            XK_l,       setmfact,         {.f = +0.05} },   /* Decrease master/stack ratio. */
+   { MODKEY,            XK_q,       killclient,       {0} },            /* Kill active window. */
+
+   /* Layouts. */
+   { MODKEY,            XK_t,       setlayout,        {.v = &layouts[0]} },   /* Default master/stack layout. */
+   { MODKEY,            XK_y,       setlayout,        {.v = &layouts[1]} },   /* Floating layout. */
+   { MODKEY,            XK_u,       setlayout,        {.v = &layouts[2]} },   /* Monocle layout. */
+   { MODKEY|ShiftMask,  XK_f,       togglefloating,   {0} },                  /* Toggle floating layout for a window. */
+   { MODKEY,            XK_f,       togglefullscr,    {0} },                  /* Toggle fullscreen for a window. */
+
+   /* Tag/monitor navigation. */
+   { MODKEY,            XK_0,       view,             {.ui = ~0 } }, /* Add all windows to current tag */
+   { MODKEY,            XK_Tab,     view,             {0} },         /* Switch to previous tag. */
+   { MODKEY|ShiftMask,  XK_0,       tag,              {.ui = ~0 } }, /* Add current window to all tags. */
+   { MODKEY,            XK_comma,   focusmon,         {.i = -1 } },
+   { MODKEY,            XK_period,  focusmon,         {.i = +1 } },
+   { MODKEY|ShiftMask,  XK_comma,   tagmon,           {.i = -1 } },
+   { MODKEY|ShiftMask,  XK_period,  tagmon,           {.i = +1 } },
+   TAGKEYS( XK_1, 0 )
+   TAGKEYS( XK_2, 1 )
+   TAGKEYS( XK_3, 2 )
+   TAGKEYS( XK_4, 3 )
+   TAGKEYS( XK_5, 4 )
+   TAGKEYS( XK_6, 5 )
+   TAGKEYS( XK_7, 6 )
+   TAGKEYS( XK_8, 7 )
+   TAGKEYS( XK_9, 8 )
+
+   /* Misc. */
+   { MODKEY,            XK_p,       spawn,            {.v = papercmd } },  /* New random wallpaper. */
+   { MODKEY,            XK_b,       togglebar,        {0} },               /* Toggle the bar. */
+   { MODKEY,            XK_minus,   setgaps,          {.i = -5 } },        /* Decrease window gaps. */
+   { MODKEY|ShiftMask,  XK_equal,   setgaps,          {.i = +5 } },        /* Increase window gaps. */
+   { MODKEY,            XK_equal,   resetgaps,        {0} },               /* Reset window gaps. */
+   { MODKEY|ShiftMask,  XK_q,       quit,             {0} },               /* Quit dwm. */
+
+   /* Function keys. */
+   { 0, 0x1008ff13, spawn, SHCMD("/home/c/.local/bin/setvol.sh i") },   /* Increase volume. */
+   { 0, 0x1008ff11, spawn, SHCMD("/home/c/.local/bin/setvol.sh d") },   /* Decrease volume.  */
+   { 0, 0x1008ff12, spawn, SHCMD("/home/c/.local/bin/setvol.sh m") },   /* Toggle mute. */
 };
 
-/* button definitions */
+/* Button definitions. */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
    /* click                event mask      button          function        argument */
diff --git a/dwm b/dwm
index c0f986f..fbcf51e 100755
--- a/dwm
+++ b/dwm