Updates dwm, st, dmenu, slock, and dwmblocks

1 files changed, 434 insertions, 484 deletions

diff --git a/dwm/config.h b/dwm/config.h
index 9bc71a8..dec3915 100755..100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -1,545 +1,495 @@
 /* See LICENSE file for copyright and license details. */
 
-/* Constants */
+/* constants */
 #define TERMINAL "st"
 #define TERMCLASS "St"
 #define BROWSER "firefox"
+#define BROWSERCLASS "Firefox"
+#define GAP 6
 
 /* appearance */
-static unsigned int borderpx = 3; /* border pixel of windows */
-static unsigned int snap = 32;    /* snap pixel */
-static unsigned int gappih = 8;   /* horiz inner gap between windows */
-static unsigned int gappiv = 8;   /* vert inner gap between windows */
-static unsigned int gappoh =
-    8; /* horiz outer gap between windows and screen edge */
-static unsigned int gappov =
-    8; /* vert outer gap between windows and screen edge */
-static int swallowfloating =
-    0; /* 1 means swallow floating windows by default */
-static int smartgaps =
-    0;                  /* 1 means no outer gap when there is only one window */
-static int showbar = 1; /* 0 means no bar */
-static int topbar = 1;  /* 0 means bottom bar */
+static unsigned int borderpx = 3;               /* border pixel of windows */
+static unsigned int snap = 32;                  /* snap pixel */
+static unsigned int gappih = GAP;               /* horiz inner gap between windows */
+static unsigned int gappiv = GAP;               /* vert inner gap between windows */
+static unsigned int gappoh = GAP;               /* horiz outer gap between windows and screen edge */
+static unsigned int gappov = GAP;               /* vert outer gap between windows and screen edge */
+static int swallowfloating = 0;                 /* 1 means swallow floating windows by default */
+static int smartgaps = 0;                       /* 1 means no outer gap when there is only one window */
+static int showbar = 1;                         /* 0 means no bar */
+static int topbar = 1;                          /* 0 means bottom bar */
+static const int vertpad = GAP;                 /* vertical padding of bar */
+static const int sidepad = GAP;                 /* horizontal padding of bar */
 static char *fonts[] = {
     "monospace:size=10",
-    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true"};
+    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
 static char normbgcolor[] = "#222222";
-static char normbordercolor[] = "#444444";
+static char normbordercolor[] = "#555555";
 static char normfgcolor[] = "#bbbbbb";
 static char selfgcolor[] = "#eeeeee";
 static char selbordercolor[] = "#4CBB17";
-// static char selbordercolor[] = "#770000";
 static char selbgcolor[] = "#005577";
+static const unsigned int baralpha = 0xd0;
+static const unsigned int borderalpha = OPAQUE;
 static char *colors[][3] = {
-    /*               fg           bg           border   */
-    [SchemeNorm] = {normfgcolor, normbgcolor, normbordercolor},
-    [SchemeSel] = {selfgcolor, selbgcolor, selbordercolor},
+    /*                      fg              bg              border  */
+    [SchemeNorm]    = { normfgcolor,     normbgcolor,    normbordercolor },
+    [SchemeSel]     = { selfgcolor,      selbgcolor,     selbordercolor },
+};
+static const unsigned int alphas[][3] = {
+    /*                  fg              bg              border  */
+    [SchemeNorm]    = { OPAQUE,      baralpha,       borderalpha },
+    [SchemeSel]     = { OPAQUE,      baralpha,       borderalpha },
 };
 
 typedef struct {
   const char *name;
   const void *cmd;
 } Sp;
-const char *spcmd1[] = {TERMINAL, "-n", "spterm", "-g", "120x34", NULL};
-const char *spcmd2[] = {TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
-                        "-g",     "50x20", "-e",     "bc", "-lq",
-                        NULL};
+
+/* scratchpads */
+const char *spcmd1[] = { TERMINAL, "-n", "spterm", "-g", "120x34", NULL };
+const char *spcmd2[] = { TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
+                        "-g",     "50x20", "-e",     "bc", "-lq", NULL };
 static Sp scratchpads[] = {
-    /* name          cmd  */
-    {"spterm", spcmd1},
-    {"spcalc", spcmd2},
+    /* name         cmd */
+    { "spterm",     spcmd1 },
+    { "spcalc",     spcmd2 },
 };
 
 /* tagging */
-static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"};
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static const Rule rules[] = {
     /* xprop(1):
      *	WM_CLASS(STRING) = instance, class
      *	WM_NAME(STRING) = title
      */
-    /* class    instance      title       	 tags mask    isfloating
-       isterminal  noswallow  monitor */
-    {"Gimp", NULL, NULL, 1 << 8, 0, 0, 0, -1},
-    {TERMCLASS, NULL, NULL, 0, 0, 1, 0, -1},
-    {NULL, NULL, "Event Tester", 0, 0, 0, 1, -1},
-    {TERMCLASS, "floatterm", NULL, 0, 1, 1, 0, -1},
-    {TERMCLASS, "bg", NULL, 1 << 7, 0, 1, 0, -1},
-    {TERMCLASS, "spterm", NULL, SPTAG(0), 1, 1, 0, -1},
-    {TERMCLASS, "spcalc", NULL, SPTAG(1), 1, 1, 0, -1},
+    /* class        instance        title           tags mask       isfloating isterminal  noswallow  monitor */
+    { "Gimp",       NULL,           NULL,           1 << 8,         0,  0,  0, -1 },
+    { "kakaotalk",  NULL,           NULL,           1 << 8,         0,  0, -1, -1 },
+    { TERMCLASS,    NULL,           NULL,           0,              0,  1,  0, -1 },
+    { BROWSERCLASS, NULL,           NULL,           0,              0,  0, -1, -1 },
+    { TERMCLASS,    "floatterm",    NULL,           0,              1,  1,  0, -1 },
+    { TERMCLASS,    "bg",           NULL,           1 << 7,         0,  1,  0, -1 },
+    { TERMCLASS,    "spterm",       NULL,           SPTAG(0),       1,  1,  0, -1 },
+    { TERMCLASS,    "spcalc",       NULL,           SPTAG(1),       1,  1,  0, -1 },
+    { NULL,         NULL,           "Event Tester", 0,              0,  0,  1, -1 },
 };
 
 /* layout(s) */
-static float mfact = 0.55;  /* factor of master area size [0.05..0.95] */
-static int nmaster = 1;     /* number of clients in master area */
-static int resizehints = 0; /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen =
-    1; /* 1 will force focus on the fullscreen window */
-#define FORCE_VSPLIT                                                           \
-  1 /* nrowgrid layout: force two clients to always split vertically */
+static float mfact = 0.55;              /* factor of master area size [0.05..0.95] */
+static int nmaster = 1;                 /* number of clients in master area */
+static int resizehints = 0;             /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen window */
+
+#define FORCE_VSPLIT 1                  /* nrowgrid layout: force two clients to always split vertically */
 #include "vanitygaps.c"
+
 static const Layout layouts[] = {
-    /* symbol     arrange function */
-    {"[]=", tile},   /* Default: Master on left, slaves on right */
-    {"TTT", bstack}, /* Master on top, slaves on bottom */
+    /* symbol   arrange function */
+    { "[]=",    tile },                     /* 0: Default: Master on left, slaves on right */
+    { "[M]",    monocle },                  /* 1: All windows on top of eachother */
+	{ "|||",    col },                      /* 2: Column */
+    { "[@]",    spiral },                   /* 3: Fibonacci spiral */
+    { "[\\]",    dwindle },                 /* 4: Decreasing in size right and leftward */
+    { "H[]",    deck },                     /* 5: Master on left, slaves in monocle-like mode on right */
+    { "TTT",    bstack },                   /* 6: Master on top, slaves on bottom horizontally */
+    { "===",    bstackhoriz },              /* 7: Master on top, slaves on bottom vertically */
+    { "HHH",    grid },                     /* 8: Equal grid */
+    { "###",    nrowgrid },                 /* 9: Number of row grid */
+    { "---",    horizgrid },                /* 10: Horizontal grid */
+    { ":::",    gaplessgrid },              /* 11: Gapless grid */
+    { "|M|",    centeredmaster },           /* 12: Master in middle, slaves on sides */
+    { ">M>",    centeredfloatingmaster },   /* 13: Same but master floats */
+    { "><>",    NULL },                     /* 14: no layout function means floating behavior */
+    { NULL,     NULL },
+};
 
-    {"[@]", spiral},   /* Fibonacci spiral */
-    {"[\\]", dwindle}, /* Decreasing in size right and leftward */
+/* imports */
+#include <X11/XF86keysym.h>
+#include "shift-tools-scratchpads.c"
+#include "tagandview.c"
+#include "exresize.c"
 
-    {"[D]", deck},    /* Master on left, slaves in monocle-like mode on right */
-    {"[M]", monocle}, /* All windows on top of eachother */
+/* key definitions */
+#define MODKEY Mod4Mask
+#define MODKEY2 Mod1Mask
 
-    {"|M|", centeredmaster},         /* Master in middle, slaves on sides */
-    {">M>", centeredfloatingmaster}, /* Same but master floats */
+#define TAGKEYS(KEY, TAG)                                                               \
+    { MODKEY,                               KEY, view,           { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask,                 KEY, toggleview,     { .ui = 1 << TAG } },  \
+    { MODKEY | ShiftMask,                   KEY, tag,            { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask | ShiftMask,     KEY, toggletag,      { .ui = 1 << TAG } },  \
+    { MODKEY2 | ShiftMask,                  KEY, tagandview,     { .ui = 1 << TAG } },
 
-    {"><>", NULL}, /* no layout function means floating behavior */
-    {NULL, NULL},
-};
+#define CTAGKEYS(KEY, TAG)                                                                      \
+	{ {0,0,0,0},                            {KEY,0,0,0}, view,          { .ui = 1 << TAG} },    \
+	{ {ControlMask,0,0,0},                  {KEY,0,0,0}, toggleview,    { .ui = 1 << TAG} },    \
+	{ {ShiftMask,0,0,0},                    {KEY,0,0,0}, tag,           { .ui = 1 << TAG} },    \
+	{ {ControlMask|ShiftMask,0,0,0},        {KEY,0,0,0}, toggletag,     { .ui = 1 << TAG} },
 
-static void tagandview(const Arg *arg);
+#define STACKKEYS(MOD, ACTION)                              \
+    { MOD,  XK_j,   ACTION##stack,  { .i = INC(+1) } },     \
+    { MOD,  XK_k,   ACTION##stack,  { .i = INC(-1) } },     \
+    { MOD,  XK_Tab, ACTION##stack,  { .i = PREVSEL } },     \
+    { MOD,  XK_x,   ACTION##stack,  { .i = 0 } },           \
+    { MOD,  XK_a,   ACTION##stack,  { .i = 1 } },           \
+    { MOD,  XK_s,   ACTION##stack,  { .i = 2 } },           \
+    { MOD,  XK_z,   ACTION##stack,  { .i = -1 } },
 
-/* key definitions */
-#define MODKEY Mod4Mask
-#define TAGKEYS(KEY, TAG)                                                      \
-  {MODKEY, KEY, view, {.ui = 1 << TAG}},                                       \
-      {MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}},               \
-      {MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}},                        \
-      {MODKEY | Mod1Mask, KEY, tagandview, {.ui = 1 << TAG}},                  \
-      {MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
-#define STACKKEYS(MOD, ACTION)                                                 \
-  {MOD, XK_j, ACTION##stack, {.i = INC(+1)}},                                  \
-      {MOD, XK_k, ACTION##stack, {.i = INC(-1)}},                              \
-      {MOD,                                                                    \
-       XK_v,                                                                   \
-       ACTION##stack,                                                          \
-       {.i = 0}}, /* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */
-                  /* { MOD, XK_a,     ACTION##stack, {.i = 1 } }, \ */
-                  /* { MOD, XK_z,     ACTION##stack, {.i = 2 } }, \ */
-                  /* { MOD, XK_x,     ACTION##stack, {.i = -1 } }, */
+#define CSTACKKEYS(MOD, ACTION)                                             \
+    { {MOD,0,0,0},  {XK_j, 0,0,0},  ACTION##stack,  { .i = INC(+1) } },     \
+    { {MOD,0,0,0},  {XK_k, 0,0,0},  ACTION##stack,  { .i = INC(-1) } },     \
+    { {MOD,0,0,0},  {XK_Tab,0,0,0}, ACTION##stack,  { .i = PREVSEL } },     \
+    { {MOD,0,0,0},  {XK_x, 0,0,0},  ACTION##stack,  { .i = 0 } },           \
+    { {MOD,0,0,0},  {XK_a, 0,0,0},  ACTION##stack,  { .i = 1 } },           \
+    { {MOD,0,0,0},  {XK_s, 0,0,0},  ACTION##stack,  { .i = 2 } },           \
+    { {MOD,0,0,0},  {XK_z, 0,0,0},  ACTION##stack,  { .i = -1 } },
 
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd)                                                             \
-  {                                                                            \
-    .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL }                       \
-  }
+#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *termcmd[] = {TERMINAL, NULL};
+// static const char *dmenucmd[] = { "dmenu_run",    "-fn", dmenufont,   "-nb",
+//                                  normbgcolor,    "-nf", normfgcolor, "-sb",
+//                                  selbordercolor, "-sf", selfgcolor,  NULL };
+static const char *termcmd[] = { TERMINAL, NULL };
 
-/*
- * Xresources preferences to load at startup
- */
+/* Xresources preferences to load at startup */
 ResourcePref resources[] = {
-    {"color0", STRING, &normbordercolor},
-    {"color8", STRING, &selbordercolor},
-    {"color0", STRING, &normbgcolor},
-    {"color4", STRING, &normfgcolor},
-    {"color0", STRING, &selfgcolor},
-    {"color4", STRING, &selbgcolor},
-    {"borderpx", INTEGER, &borderpx},
-    {"snap", INTEGER, &snap},
-    {"showbar", INTEGER, &showbar},
-    {"topbar", INTEGER, &topbar},
-    {"nmaster", INTEGER, &nmaster},
-    {"resizehints", INTEGER, &resizehints},
-    {"mfact", FLOAT, &mfact},
-    {"gappih", INTEGER, &gappih},
-    {"gappiv", INTEGER, &gappiv},
-    {"gappoh", INTEGER, &gappoh},
-    {"gappov", INTEGER, &gappov},
-    {"swallowfloating", INTEGER, &swallowfloating},
-    {"smartgaps", INTEGER, &smartgaps},
+    { "color0", STRING, &normbordercolor },
+    { "color8", STRING, &selbordercolor },
+    { "color0", STRING, &normbgcolor },
+    { "color4", STRING, &normfgcolor },
+    { "color0", STRING, &selfgcolor },
+    { "color4", STRING, &selbgcolor },
+    { "borderpx", INTEGER, &borderpx },
+    { "snap", INTEGER, &snap },
+    { "showbar", INTEGER, &showbar },
+    { "topbar", INTEGER, &topbar },
+    { "nmaster", INTEGER, &nmaster },
+    { "resizehints", INTEGER, &resizehints },
+    { "mfact", FLOAT, &mfact },
+    { "gappih", INTEGER, &gappih },
+    { "gappiv", INTEGER, &gappiv },
+    { "gappoh", INTEGER, &gappoh },
+    { "gappov", INTEGER, &gappov },
+    { "swallowfloating", INTEGER, &swallowfloating },
+    { "smartgaps", INTEGER, &smartgaps },
 };
 
-#include "shiftview.c"
-#include <X11/XF86keysym.h>
-
 static const Key keys[] = {
-    /* modifier                     key        function        argument */
-    STACKKEYS(MODKEY, focus) STACKKEYS(MODKEY | ShiftMask, push)
-    /* { MODKEY|ShiftMask,		XK_Escape,	spawn,	SHCMD("") }, */
-    {MODKEY, XK_grave, spawn, {.v = (const char *[]){"dmenuunicode", NULL}}},
-    /* { MODKEY|ShiftMask,		XK_grave,	togglescratch,
-       SHCMD("") }, */
-    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_0, view, {.ui = ~0}},
-    {MODKEY | ShiftMask, XK_0, tag, {.ui = ~0}},
-    {MODKEY, XK_minus, 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, XK_equal, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY | ShiftMask, XK_equal, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY, XK_BackSpace, spawn, {.v = (const char *[]){"sysact", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_BackSpace,
-     spawn,
-     {.v = (const char *[]){"sysact", NULL}}},
-
-    {MODKEY, XK_Tab, view, {0}},
-    /* { MODKEY|ShiftMask,		XK_Tab,		spawn,
-       SHCMD("") }, */
-    {MODKEY, XK_q, killclient, {0}},
-    {MODKEY | ShiftMask, XK_q, spawn, {.v = (const char *[]){"sysact", NULL}}},
-    {MODKEY, XK_w, spawn, {.v = (const char *[]){BROWSER, NULL}}},
-    {MODKEY | ShiftMask,
-     XK_w,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "sudo", "nmtui", NULL}}},
-    {MODKEY | ControlMask, XK_w, spawn,
-     SHCMD(TERMINAL
-           " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport")},
-    {MODKEY, XK_e, spawn,
-     SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook "
-                    "2>/dev/null")},
-    // {MODKEY | ShiftMask, XK_e, spawn,
-    //  SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile "
-    //                 "~/.config/abook/addressbook")},
-    {MODKEY | ShiftMask, XK_e, spawn,
-     SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile "
-                    "~/.abook/addressbook")},
-    {MODKEY,
-     XK_r,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "lfub", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_r,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "htop", NULL}}},
-    {MODKEY, XK_t, setlayout, {.v = &layouts[0]}},             /* tile */
-    {MODKEY | ShiftMask, XK_t, setlayout, {.v = &layouts[1]}}, /* bstack */
-    {MODKEY, XK_y, setlayout, {.v = &layouts[2]}},             /* spiral */
-    {MODKEY | ShiftMask, XK_y, setlayout, {.v = &layouts[3]}}, /* dwindle */
-    {MODKEY, XK_u, setlayout, {.v = &layouts[4]}},             /* deck */
-    {MODKEY | ShiftMask, XK_u, setlayout, {.v = &layouts[5]}}, /* monocle */
-    {MODKEY, XK_i, setlayout, {.v = &layouts[6]}}, /* centeredmaster */
-    {MODKEY | ShiftMask,
-     XK_i,
-     setlayout,
-     {.v = &layouts[7]}}, /* centeredfloatingmaster */
-    {MODKEY, XK_o, incnmaster, {.i = +1}},
-    {MODKEY | ShiftMask, XK_o, incnmaster, {.i = -1}},
-    {MODKEY, XK_p, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}}},
-    {MODKEY | ShiftMask, XK_p, spawn, SHCMD("mpc pause; pauseallmpv")},
-    {MODKEY,
-     XK_bracketleft,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "-10", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_bracketleft,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "-60", NULL}}},
-    {MODKEY,
-     XK_bracketright,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "+10", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_bracketright,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "+60", NULL}}},
-    {MODKEY, XK_backslash, view, {0}},
-    /* { MODKEY|ShiftMask,		XK_backslash,		spawn,
-       SHCMD("") }, */
-
-    {MODKEY, XK_a, togglegaps, {0}},
-    {MODKEY | ShiftMask, XK_a, defaultgaps, {0}},
-    {MODKEY, XK_s, togglesticky, {0}},
-    /* { MODKEY|ShiftMask,		XK_s,		spawn,
-       SHCMD("") }, */
-    {MODKEY | ShiftMask, XK_s, spawn,
-     SHCMD("mpc load Entire; mpc random; mpc play; pkill -RTMIN+11 dwmblocks")},
-    {MODKEY | ControlMask, XK_s, spawn,
-     SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks")},
-    {MODKEY, XK_d, spawn, {.v = (const char *[]){"dmenu_run", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_d,
-     spawn,
-     {.v = (const char *[]){"passmenu", NULL}}},
-    {MODKEY, XK_f, togglefullscr, {0}},
-    {MODKEY | ShiftMask, XK_f, setlayout, {.v = &layouts[8]}},
-    {MODKEY, XK_g, shiftview, {.i = -1}},
-    {MODKEY | ShiftMask, XK_g, shifttag, {.i = -1}},
-    {MODKEY, XK_h, setmfact, {.f = -0.05}},
-    /* J and K are automatically bound above in STACKEYS */
-    {MODKEY, XK_l, setmfact, {.f = +0.05}},
-    {MODKEY, XK_semicolon, shiftview, {.i = 1}},
-    {MODKEY | ShiftMask, XK_semicolon, shifttag, {.i = 1}},
-    {MODKEY, XK_apostrophe, togglescratch, {.ui = 1}},
-    /* { MODKEY|ShiftMask,		XK_apostrophe,	spawn,
-       SHCMD("") }, */
-    {MODKEY | ShiftMask, XK_apostrophe, togglesmartgaps, {0}},
-    {MODKEY, XK_Return, spawn, {.v = termcmd}},
-    {MODKEY | ShiftMask, XK_Return, togglescratch, {.ui = 0}},
-
-    {MODKEY, XK_z, incrgaps, {.i = +3}},
-    /* { MODKEY|ShiftMask,		XK_z,		spawn,
-       SHCMD("") }, */
-    {MODKEY, XK_x, incrgaps, {.i = -3}},
-    /* { MODKEY|ShiftMask,		XK_x,		spawn,
-       SHCMD("") }, */
-    {MODKEY,
-     XK_c,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "profanity", NULL}}},
-    /* { MODKEY|ShiftMask,		XK_c,		spawn,
-       SHCMD("") }, */
-    /* V is automatically bound above in STACKKEYS */
-    {MODKEY, XK_b, togglebar, {0}},
-    /* { MODKEY|ShiftMask,		XK_b,		spawn,
-       SHCMD("") }, */
-    {MODKEY,
-     XK_n,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "nvim", "-c", "VimwikiIndex",
-                            NULL}}},
-    {MODKEY | ShiftMask, XK_n, spawn,
-     SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks")},
-    {MODKEY,
-     XK_m,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}},
-    {MODKEY | ShiftMask, XK_m, spawn,
-     SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY, XK_comma, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_comma,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "0%", NULL}}},
-    {MODKEY, XK_period, spawn, {.v = (const char *[]){"mpc", "next", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_period,
-     spawn,
-     {.v = (const char *[]){"mpc", "repeat", NULL}}},
-
-    {MODKEY, XK_Left, focusmon, {.i = -1}},
-    {MODKEY | ShiftMask, XK_Left, tagmon, {.i = -1}},
-    {MODKEY, XK_Right, focusmon, {.i = +1}},
-    {MODKEY | ShiftMask, XK_Right, tagmon, {.i = +1}},
-
-    {MODKEY, XK_Page_Up, shiftview, {.i = -1}},
-    {MODKEY | ShiftMask, XK_Page_Up, shifttag, {.i = -1}},
-    {MODKEY, XK_Page_Down, shiftview, {.i = +1}},
-    {MODKEY | ShiftMask, XK_Page_Down, shifttag, {.i = +1}},
-    {MODKEY, XK_Insert, spawn,
-     SHCMD("xdotool type $(grep -v '^#' ~/.local/share/larbs/snippets | dmenu "
-           "-i -l 50 | cut -d' ' -f1)")},
-
-    {MODKEY, XK_F1, spawn,
-     SHCMD("groff -mom ~/.local/share/dwm/larbs.mom -Tpdf | zathura -")},
-    {MODKEY | ShiftMask, XK_F1, spawn, SHCMD("nsxiv ~/Pictures/resources")},
-    {MODKEY, XK_F2, spawn, {.v = (const char *[]){"tutorialvids", NULL}}},
-    {MODKEY, XK_F3, spawn, {.v = (const char *[]){"displayselect", NULL}}},
-    {MODKEY, XK_F4, spawn,
-     SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)")},
-    {MODKEY, XK_F5, xrdb, {.v = NULL}},
-    {MODKEY, XK_F6, spawn, {.v = (const char *[]){"torwrap", NULL}}},
-    {MODKEY | ControlMask,
-     XK_F6,
-     spawn,
-     {.v = (const char *[]){"td-remove", NULL}}},
-    {MODKEY, XK_F7, spawn, {.v = (const char *[]){"td-toggle", NULL}}},
-    {MODKEY, XK_F8, spawn, {.v = (const char *[]){"mailsync", NULL}}},
-    {MODKEY, XK_F9, spawn, {.v = (const char *[]){"mounter", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_F9,
-     spawn,
-     {.v = (const char *[]){"mpvplay", NULL}}},
-    {MODKEY, XK_F10, spawn, {.v = (const char *[]){"unmounter", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_F10,
-     spawn,
-     {.v = (const char *[]){"qndl", "-v", NULL}}},
-    {MODKEY | ControlMask,
-     XK_F10,
-     spawn,
-     {.v = (const char *[]){"qndl", "-m", NULL}}},
-    {MODKEY, XK_F11, spawn,
-     SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings "
-           "--profile=low-latency --input-conf=/dev/null --title=webcam $(ls "
-           "/dev/video[0,2,4,6,8] | tail -n 1)")},
-    {MODKEY | ShiftMask,
-     XK_F11,
-     spawn,
-     {.v = (const char *[]){"kakaotalk", NULL}}},
-    {MODKEY, XK_F12, spawn, SHCMD("remaps")},
-    {MODKEY | ShiftMask,
-     XK_F12,
-     spawn,
-     {.v = (const char *[]){"fcitx5-configtool", NULL}}},
-    {MODKEY, XK_space, zoom, {0}},
-    {MODKEY | ShiftMask, XK_space, togglefloating, {0}},
-
-    {0, XK_Print, spawn,
-     SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | "
-           "xclip -selection clipboard")},
-    {ShiftMask, XK_Print, spawn, {.v = (const char *[]){"maimpick", NULL}}},
-    {MODKEY, XK_Print, spawn, {.v = (const char *[]){"dmenurecord", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_Print,
-     spawn,
-     {.v = (const char *[]){"dmenurecord", "kill", NULL}}},
-    {MODKEY,
-     XK_Delete,
-     spawn,
-     {.v = (const char *[]){"dmenurecord", "kill", NULL}}},
-    {MODKEY, XK_Scroll_Lock, spawn, SHCMD("killall screenkey || screenkey &")},
-    {MODKEY | ControlMask,
-     XK_minus,
-     spawn,
-     {.v = (const char *[]){"brillo", "-U", "5", "-q", NULL}}},
-    {MODKEY | ControlMask,
-     XK_equal,
-     spawn,
-     {.v = (const char *[]){"brillo", "-A", "5", "-q", NULL}}},
-
-    {0, XF86XK_AudioMute, spawn,
-     SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof "
-           "dwmblocks)")},
-    {0, XF86XK_AudioRaiseVolume, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume "
-           "@DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)")},
-    {0, XF86XK_AudioLowerVolume, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume "
-           "@DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)")},
-    {0, XF86XK_AudioPrev, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}},
-    {0, XF86XK_AudioNext, spawn, {.v = (const char *[]){"mpc", "next", NULL}}},
-    {0,
-     XF86XK_AudioPause,
-     spawn,
-     {.v = (const char *[]){"mpc", "pause", NULL}}},
-    {0, XF86XK_AudioPlay, spawn, {.v = (const char *[]){"mpc", "play", NULL}}},
-    {0, XF86XK_AudioStop, spawn, {.v = (const char *[]){"mpc", "stop", NULL}}},
-    {0,
-     XF86XK_AudioRewind,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "-10", NULL}}},
-    {0,
-     XF86XK_AudioForward,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "+10", NULL}}},
-    {0,
-     XF86XK_AudioMedia,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}},
-    {0, XF86XK_AudioMicMute, spawn,
-     SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle")},
-    /* { 0, XF86XK_PowerOff,		spawn,		{.v = (const char*[]){
-       "sysact", NULL } } }, */
-    {0,
-     XF86XK_Calculator,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "bc", "-l", NULL}}},
-    {0,
-     XF86XK_Sleep,
-     spawn,
-     {.v = (const char *[]){"sudo", "-A", "zzz", NULL}}},
-    {0, XF86XK_WWW, spawn, {.v = (const char *[]){BROWSER, NULL}}},
-    {0, XF86XK_DOS, spawn, {.v = termcmd}},
-    {0, XF86XK_ScreenSaver, spawn,
-     SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv")},
-    {0,
-     XF86XK_TaskPane,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "htop", NULL}}},
-    {0, XF86XK_Mail, spawn,
-     SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks")},
-    {0,
-     XF86XK_MyComputer,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "lfub", "/", NULL}}},
-    /* { 0, XF86XK_Battery,		spawn,		SHCMD("") }, */
-    {0,
-     XF86XK_Launch1,
-     spawn,
-     {.v = (const char *[]){"xset", "dpms", "force", "off", NULL}}},
-    {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 *[]){"xbacklight", "-inc", "15", NULL}}},
-    {0,
-     XF86XK_MonBrightnessDown,
-     spawn,
-     {.v = (const char *[]){"xbacklight", "-dec", "15", NULL}}},
-
-    /* ===================================================================\= */
-    /* { MODKEY|Mod4Mask,              XK_h,      incrgaps,       {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask,              XK_l,      incrgaps,       {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask|ShiftMask,    XK_h,      incrogaps,      {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask|ShiftMask,    XK_l,      incrogaps,      {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask|ControlMask,  XK_h,      incrigaps,      {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask|ControlMask,  XK_l,      incrigaps,      {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask|ShiftMask,    XK_0,      defaultgaps,    {0} }, */
-    /* { MODKEY,                       XK_y,      incrihgaps,     {.i = +1 } },
-     */
-    /* { MODKEY,                       XK_o,      incrihgaps,     {.i = -1 } },
-     */
-    /* { MODKEY|ControlMask,           XK_y,      incrivgaps,     {.i = +1 } },
-     */
-    /* { MODKEY|ControlMask,           XK_o,      incrivgaps,     {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask,              XK_y,      incrohgaps,     {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask,              XK_o,      incrohgaps,     {.i = -1 } },
-     */
-    /* { MODKEY|ShiftMask,             XK_y,      incrovgaps,     {.i = +1 } },
-     */
-    /* { MODKEY|ShiftMask,             XK_o,      incrovgaps,     {.i = -1 } },
-     */
+    /* STACKKEYS */
+    STACKKEYS(MODKEY,               focus)
+    STACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+    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)
+
+    /* modifier                             key                 function            argument */
+    /* AUDIO CONTROL */
+    { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY | ShiftMask,                   XK_m,               spawn,              { .v = (const char *[]){ "playlists", NULL } } },
+    { MODKEY | ControlMask,                 XK_m,               spawn,              { .v = (const char *[]){ "mpdmenu", NULL } } },
+    { MODKEY,                               XK_p,               spawn,              { .v = (const char *[]){ "mpc", "toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; pauseallmpv") },
+    { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_s,               spawn,              SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY,                               XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { MODKEY,                               XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-60", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+60", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
+    { MODKEY ,                              XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "single", NULL } } },
+    { MODKEY | ShiftMask,                   XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "random", NULL } } },
+    { MODKEY | ControlMask,                 XK_backslash,       spawn,              SHCMD("mpc repeat off; mpc random off; mpc single off; pkill -RTMIN+11 dwmblocks") },
+
+    /* LAYOUT SIZE */
+    { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
+    { MODKEY | ControlMask,                 XK_n,               incnmaster,         { .i = +1 } },
+    { MODKEY,                               XK_f,               togglefullscr,      {0} },
+    { MODKEY,                               XK_h,               setmfact,           { .f = -0.05 } },
+    { MODKEY,                               XK_l,               setmfact,           { .f = +0.05 } },
+    { MODKEY,                               XK_s,               togglesticky,       {0} },
+    { MODKEY,                               XK_space,           zoom,               {0} },
+    { MODKEY | ControlMask,                 XK_j,               setcfact,           { .f = -0.25 } },
+    { MODKEY | ControlMask,                 XK_k,               setcfact,           { .f = +0.25 } },
+    { MODKEY | ControlMask,                 XK_y,               setcfact,           { .f = 0.00 } },
+    { MODKEY | ShiftMask,                   XK_c,               incrgaps,           { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_c,               incrgaps,           { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_i,               incrigaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_i,               incrigaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_o,               incrogaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_o,               incrogaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_h,               incrihgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_h,               incrihgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_g,               incrivgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_g,               incrivgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_b,               incrohgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_b,               incrohgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_v,               incrovgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_v,               incrovgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_t,               togglegaps,         {0} },
+    { MODKEY | ControlMask,                 XK_t,               defaultgaps,        {0} },
+ 
+    /* FLOATING SIZE */
+	{ MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
+	{ MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
+
+    /* MEDIA CONTROL */
+    { 0, XF86XK_Battery,                    spawn, SHCMD("pkill -RTMIN+3 dwmblocks") },
+    { 0, XF86XK_WWW,                        spawn, { .v = (const char *[]){ BROWSER, NULL } } },
+    { 0, XF86XK_DOS,                        spawn, { .v = termcmd } },
+    { 0, XF86XK_AudioMute,                  spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioRaiseVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioLowerVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioPrev,                  spawn, { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { 0, XF86XK_AudioNext,                  spawn, { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { 0, XF86XK_AudioPause,                 spawn, { .v = (const char *[]){ "mpc", "pause", NULL } } },
+    { 0, XF86XK_AudioPlay,                  spawn, { .v = (const char *[]){ "mpc", "play", NULL } } },
+    { 0, XF86XK_AudioStop,                  spawn, { .v = (const char *[]){ "mpc", "stop", NULL } } },
+    { 0, XF86XK_AudioRewind,                spawn, { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { 0, XF86XK_AudioForward,               spawn, { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { 0, XF86XK_AudioMedia,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { 0, XF86XK_AudioMicMute,               spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
+    { 0, XF86XK_PowerOff,                   spawn, { .v = (const char*[]){ "sysact", NULL } } },
+    { 0, XF86XK_Calculator,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "bc", "-l", NULL } } },
+    { 0, XF86XK_Sleep,                      spawn, { .v = (const char *[]){ "sudo", "-A", "zzz", NULL } } },
+    { 0, XF86XK_ScreenSaver,                spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
+    { 0, XF86XK_TaskPane,                   spawn, { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { 0, XF86XK_Mail,                       spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
+    { 0, XF86XK_MyComputer,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "lfub", "/", NULL } } },
+    { 0, XF86XK_Launch1,                    spawn, { .v = (const char *[]){ "xset", "dpms", "force", "off", NULL } } },
+    { 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 *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { 0, XF86XK_MonBrightnessDown,          spawn, { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+
+    /* MODE */
+	{ MODKEY,                               XK_Escape,          setkeymode,         { .ui = ModeCommand } },
+
+    /* PROGRAM */
+    { MODKEY,                               XK_d,               spawn,              { .v = (const char *[]){ "dmenu_run", NULL } } },
+    { MODKEY,                               XK_e,               spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { MODKEY,                               XK_n,               spawn,              SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { MODKEY,                               XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { MODKEY | ShiftMask,                   XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { MODKEY,                               XK_w,               spawn,              { .v = (const char *[]){ BROWSER, NULL } } },
+    { MODKEY,                               XK_c,               togglescratch,      { .ui = 1 } }, /* calculator */
+    { MODKEY,                               XK_u,               spawn,              { .v = (const char *[]){ "dmenuunicode", NULL } } },
+    { MODKEY,                               XK_Return,          spawn,              { .v = termcmd } },
+    { MODKEY | ShiftMask,                   XK_Return,          spawn,              { .v = (const char *[]){ "sd", NULL } } },
+    { MODKEY | ControlMask,                 XK_Return,          togglescratch,      { .ui = 0 } }, /* terminal */
+
+    /* SCRIPT */
+    { MODKEY | ShiftMask,                   XK_d,               spawn,              { .v = (const char *[]){ "passmenu", NULL } } },
+    { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
+    { MODKEY | ShiftMask,                   XK_f,               spawn,              { .v = (const char *[]){ "fecrypt", NULL } } },
+    { MODKEY,                               XK_v,               spawn,              { .v = (const char *[]){ "mpvplay", NULL } } },
+    { MODKEY,                               XK_Insert,          spawn,              SHCMD("xdotool type $(grep -v '^#' ~/.local/share/thesiah/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
+    { 0,                                    XK_Print,           spawn,              SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | xclip -selection clipboard") },
+    { ShiftMask,                            XK_Print,           spawn,              { .v = (const char *[]){ "maimpick", NULL } } },
+    { MODKEY,                               XK_Print,           spawn,              { .v = (const char *[]){ "dmenurecord", NULL } } },
+    { MODKEY,                               XK_Delete,          spawn,              { .v = (const char *[]){ "dmenurecord", "kill", NULL } } },
+    { MODKEY,                               XK_Scroll_Lock,     spawn,              SHCMD("killall screenkey || screenkey -t 3 -p fixed -s small -g 20%x5%+40%-5% --key-mode keysyms --bak-mode normal --mods-mode normal -f ttf-font-awesome --opacity 0.5 &") },
+    { MODKEY,                               XK_F1,              spawn,              SHCMD("groff -mom /home/si/.local/share/man/thesiah/thesiah.mom -Tpdf | zathura -") },
+    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ~/Pictures/resources") },
+    { MODKEY | ControlMask,                 XK_F1,              spawn,              { .v = (const char *[]){ TERMINAL, "-e", "dman", NULL } } },
+    { MODKEY,                               XK_F2,              spawn,              { .v = (const char *[]){ "tutorialvids", NULL } } },
+    { MODKEY,                               XK_F3,              spawn,              { .v = (const char *[]){ "displayselect", NULL } } },
+    { MODKEY,                               XK_F4,              spawn,              SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_F5,              xrdb,               { .v = NULL } },
+    { MODKEY | ShiftMask,                   XK_F5,              spawn,              SHCMD("stw ~/.dotfiles/arch -d") },
+    { MODKEY | ControlMask,                 XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", NULL } } },
+    { MODKEY,                               XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-v", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-m", NULL } } },
+    { MODKEY,                               XK_F7,              spawn,              { .v = (const char *[]){ "td-toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F7,              spawn,              { .v = (const char *[]){ "transadd", NULL } } },
+    { MODKEY,                               XK_F8,              spawn,              { .v = (const char *[]){ "mailsync", NULL } } },
+    { MODKEY,                               XK_F9,              spawn,              { .v = (const char *[]){ "mounter", NULL } } },
+    { MODKEY,                               XK_F10,             spawn,              { .v = (const char *[]){ "unmounter", NULL } } },
+    { MODKEY,                               XK_F11,             spawn,              SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls " "/dev/video[0,2,4,6,8] | tail -n 1)") },
+    { MODKEY,                               XK_F12,             spawn,              SHCMD("remaps") },
+    { MODKEY | ShiftMask,                   XK_F12,             spawn,              { .v = (const char *[]){ "fcitx5-configtool", NULL } } },
+
+    /* SYSTEM */
+    { MODKEY | ControlMask,                 XK_f,               spawn,              SHCMD("pkill -f firefox") },
+    { MODKEY | ControlMask,                 XK_k,               spawn,              SHCMD("pkill -f kakaotalk") },
+    { MODKEY,                               XK_q,               killclient,         {0} },
+    { MODKEY | ShiftMask,                   XK_q,               killclient,         { .ui = 1 } },
+    { MODKEY | ControlMask,                 XK_q,               killclient,         { .ui = 2 } },
+    { MODKEY,                               XK_BackSpace,       spawn,              { .v = (const char *[]){ "slock", NULL } } },
+    { MODKEY | ShiftMask,                   XK_BackSpace,       spawn,              { .v = (const char *[]){ "sysact", NULL } } },
+    { MODKEY,                               XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+    { 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 *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { MODKEY | ControlMask,                 XK_equal,           spawn,              { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+    { 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") },
+
+    /* TRAVERSAL */
+    { MODKEY | ShiftMask,                   XK_0,               tag,                { .ui = ~0 } },
+	{ MODKEY2,                              XK_comma,           shiftview,          { .i = -1 } },
+	{ MODKEY2,                              XK_period,          shiftview,          { .i = 1 } },
+    { MODKEY2 | ShiftMask,                  XK_comma,           shifttag,           { .i = -1 } },
+    { MODKEY2 | ShiftMask,                  XK_period,          shifttag,           { .i = 1 } },
+	{ MODKEY,                               XK_comma,           shiftviewclients,   { .i = -1 } },
+	{ MODKEY,                               XK_period,          shiftviewclients,   { .i = +1 } },
+	{ MODKEY | ShiftMask,                   XK_comma,           shifttagclients,    { .i = -1 } },
+	{ MODKEY | ShiftMask,                   XK_period,          shifttagclients,    { .i = +1 } },
+	{ MODKEY | ControlMask,                 XK_comma,           shiftboth,          { .i = -1 } },
+	{ MODKEY | ControlMask,                 XK_period,          shiftboth,          { .i = +1 } },
+	{ MODKEY | ShiftMask | ControlMask,     XK_comma,           shiftswaptags,      { .i = -1 }	},
+	{ MODKEY | ShiftMask | ControlMask,     XK_period,          shiftswaptags,      { .i = +1 }	},
+    { MODKEY,                               XK_Left,            focusmon,           { .i = -1 } },
+    { MODKEY,                               XK_Right,           focusmon,           { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Left,            tagmon,             { .i = -1 } },
+    { MODKEY | ShiftMask,                   XK_Right,           tagmon,             { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Tab,             view,               {0} },
+
+    /* { MODKEY | ShiftMask,                   XK_apostrophe,      togglesmartgaps,    {0} }, */
+  
+};
+
+static Key cmdkeys[] = {
+	/* modifier                         keys                function        argument */
+	{ 0,                                XK_Escape,          clearcmd,       {0} },
+	{ ControlMask,                      XK_c,               clearcmd,       {0} },
+	{ ControlMask,                      XK_x,               setkeymode,     { .ui = ModeInsert } },
+};
+
+static Command commands[] = {
+    /* STACKKEYS */
+    CSTACKKEYS(MODKEY,               focus)
+    CSTACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+	CTAGKEYS(XK_1, 0)
+	CTAGKEYS(XK_2, 1)
+	CTAGKEYS(XK_3, 2)
+	CTAGKEYS(XK_4, 3)
+	CTAGKEYS(XK_5, 4)
+	CTAGKEYS(XK_6, 5)
+	CTAGKEYS(XK_7, 6)
+	CTAGKEYS(XK_8, 7)
+	CTAGKEYS(XK_9, 8)
+
+    /* Modifier (4 keys)                keysyms (4 keys)            function                argument */
+    /* APPEARANCE */
+    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
+    { { ShiftMask, 0, 0, 0 },           { XK_o, 0, 0, 0 },          toggleborder,           {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_f, 0, 0, 0 },          togglefloating,         {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          togglegaps,             {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
+
+    /* LAYOUT */
+    { { 0, 0, 0, 0 },                   { XK_l, XK_t, 0, 0 },       setlayout,              { .v = &layouts[0] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_m, 0, 0 },       setlayout,              { .v = &layouts[1] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_l, 0 },    setlayout,              { .v = &layouts[2] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_s, 0, 0 },       setlayout,              { .v = &layouts[3] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_w, 0, 0 },       setlayout,              { .v = &layouts[4] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_d, 0, 0 },       setlayout,              { .v = &layouts[5] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_e, 0 },    setlayout,              { .v = &layouts[6] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_h, 0 },    setlayout,              { .v = &layouts[7] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_e, 0 },    setlayout,              { .v = &layouts[8] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_r, 0 },    setlayout,              { .v = &layouts[9] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_h, 0 },    setlayout,              { .v = &layouts[10] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_g, 0 },    setlayout,              { .v = &layouts[11] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_m, 0 },    setlayout,              { .v = &layouts[12] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_f, 0 },    setlayout,              { .v = &layouts[13] } },
+
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_u, 0, 0 },       explace,                { .ui = EX_NW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_i, 0, 0 },       explace,                { .ui = EX_N } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_o, 0, 0 },       explace,                { .ui = EX_NE } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_h, 0, 0 },       explace,                { .ui = EX_W } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_k, 0, 0 },       explace,                { .ui = EX_C } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_l, 0, 0 },       explace,                { .ui = EX_E } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_m, 0, 0 },       explace,                { .ui = EX_SW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_comma, 0, 0 },   explace,                { .ui = EX_S } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_period, 0, 0 },  explace,                { .ui = EX_SE } },
+
+    /* FLOATING SIZE */
+	{ { ControlMask, 0, 0, 0 },         { XK_j, 0, 0, 0 },          exresize,               { .v = (int []){   0,  25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_k, 0, 0, 0 },          exresize,               { .v = (int []){   0, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_l, 0, 0, 0 },          exresize,               { .v = (int []){  25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_h, 0, 0, 0 },          exresize,               { .v = (int []){ -25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_comma, 0, 0, 0 },      exresize,               { .v = (int []){ -25, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_period, 0, 0, 0 },     exresize,               { .v = (int []){  25,  25 } } },
+
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_h, 0 },    togglehorizontalexpand, { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_h, 0 },    togglehorizontalexpand, { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_h, 0 },    togglehorizontalexpand, { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_v, 0 },    toggleverticalexpand,   { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_v, 0 },    toggleverticalexpand,   { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_v, 0 },    toggleverticalexpand,   { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_m, 0 },    togglemaximize,         { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_m, 0 },    togglemaximize,         { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_m, 0 },    togglemaximize,         { .i = -1 } },
 
+    /* PROGRAM */
+    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile ~/.abook/addressbook") },
+    { { 0, 0, 0, 0 },                   { XK_e, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { { 0, 0, 0, 0 },                   { XK_g, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "gimp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_h, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_k, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "kakaotalk", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_m, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_n, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_r, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_s, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im /home/si/.dotfiles/THESIAH/progs.csv") },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_h, 0, 0 },       spawn,                  { .v = (const char *[]){ "thunderbird", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_w, 0, 0 },       spawn,                  { .v = (const char *[]){ "torwrap", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0,    0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_e, 0, 0 },       spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport") },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_f, 0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
 };
 
 /* button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
  * ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
-/* click                event mask      button          function        argument
- */
+/*      click           event mask      button      function        argument */
 #ifndef __OpenBSD__
-    {ClkWinTitle, 0, Button2, zoom, {0}},
-    {ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1}},
-    {ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2}},
-    {ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3}},
-    {ClkStatusText, 0, Button4, sigdwmblocks, {.i = 4}},
-    {ClkStatusText, 0, Button5, sigdwmblocks, {.i = 5}},
-    {ClkStatusText, ShiftMask, Button1, sigdwmblocks, {.i = 6}},
+    { ClkWinTitle,      0,              Button2,    zoom, {0} },
+    { ClkStatusText,    0,              Button1,    sigdwmblocks,   { .i = 1 } },
+    { ClkStatusText,    0,              Button2,    sigdwmblocks,   { .i = 2 } },
+    { ClkStatusText,    0,              Button3,    sigdwmblocks,   { .i = 3 } },
+    { ClkStatusText,    0,              Button4,    sigdwmblocks,   { .i = 4 } },
+    { ClkStatusText,    0,              Button5,    sigdwmblocks,   { .i = 5 } },
+    { ClkStatusText,    ShiftMask,      Button1,    sigdwmblocks,   { .i = 6 } },
 #endif
-    {ClkStatusText, ShiftMask, Button3, spawn,
-     SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h")},
-    {ClkClientWin, MODKEY, Button1, movemouse, {0}},
-    {ClkClientWin, MODKEY, Button2, defaultgaps, {0}},
-    {ClkClientWin, MODKEY, Button3, resizemouse, {0}},
-    {ClkClientWin, MODKEY, Button4, incrgaps, {.i = +1}},
-    {ClkClientWin, MODKEY, Button5, incrgaps, {.i = -1}},
-    {ClkTagBar, 0, Button1, view, {0}},
-    {ClkTagBar, 0, Button3, toggleview, {0}},
-    {ClkTagBar, MODKEY, Button1, tag, {0}},
-    {ClkTagBar, MODKEY, Button3, toggletag, {0}},
-    {ClkTagBar, 0, Button4, shiftview, {.i = -1}},
-    {ClkTagBar, 0, Button5, shiftview, {.i = 1}},
-    {ClkRootWin, 0, Button2, togglebar, {0}},
+    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h") },
+    { ClkClientWin,     MODKEY,         Button1,    movemouse,      {0} },
+    { ClkClientWin,     MODKEY,         Button2,    defaultgaps,    {0} },
+    { ClkClientWin,     MODKEY,         Button3,    resizemouse,    {0} },
+    { ClkClientWin,     MODKEY,         Button4,    incrgaps,       { .i = +1 } },
+    { ClkClientWin,     MODKEY,         Button5,    incrgaps,       { .i = -1 } },
+    { ClkTagBar,        0,              Button1,    view,           {0} },
+    { ClkTagBar,        0,              Button3,    toggleview,     {0} },
+    { ClkTagBar,        MODKEY,         Button1,    tag,            {0} },
+    { ClkTagBar,        MODKEY,         Button3,    toggletag,      {0} },
+    { ClkTagBar,        0,              Button4,    shiftview,      { .i = -1 } },
+    { ClkTagBar,        0,              Button5,    shiftview,      { .i = 1 } },
+    { ClkRootWin,       0,              Button2,    togglebar,      {0} },
 };