Update keybindings

diff --git a/config.h b/config.h
index a17a1f4ff34f6631ed43a91647323a09f0d5e040..5498936c7ac78f8ae8f22a95fec4853cedb2942d 100644 (file)
--- a/config.h
+++ b/config.h
@@ -62,43 +62,41 @@ static const char *dmenucmd[] = { "dmenu_run", NULL };
 static const char *termcmd[]  = { "tmuxt" };
 
 static Key keys[] = {
-       /* modifier                     key        function        argument */
-       { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-       { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-       { MODKEY,                       XK_b,      togglebar,      {0} },
-       { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-       { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-       { 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_Return, zoom,           {0} },
-       { MODKEY,                       XK_Tab,    view,           {0} },
-       { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-       { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-       { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-       { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-       { MODKEY,                       XK_space,  setlayout,      {0} },
-       { MODKEY|ShiftMask,             XK_space,  togglefloating, {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 } },
-       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|ShiftMask,             XK_q,      quit,           {0} },
-       /***************************************************************/
-       { MODKEY|ShiftMask, XK_p,      spawn, SHCMD("passmenu") },
-       { MODKEY,           XK_Escape, spawn, SHCMD("slock") },
+       /* modifier         key        function        argument */
+       { MODKEY,           XK_p,      spawn,          {.v = dmenucmd } },
+       { MODKEY|ShiftMask, XK_p,      spawn,          SHCMD("passmenu") },
+       { MODKEY|ShiftMask, XK_Return, spawn,          {.v = termcmd } },
+       { MODKEY,           XK_b,      togglebar,      {0} },
+       { MODKEY,           XK_j,      focusstack,     {.i = +1 } },
+       { MODKEY,           XK_k,      focusstack,     {.i = -1 } },
+       { 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_Return, zoom,           {0} },
+       { MODKEY,           XK_Tab,    view,           {0} },
+       { MODKEY|ShiftMask, XK_c,      killclient,     {0} },
+       { MODKEY,           XK_t,      setlayout,      {.v = &layouts[0]} },
+       { MODKEY,           XK_f,      setlayout,      {.v = &layouts[1]} },
+       { MODKEY,           XK_m,      setlayout,      {.v = &layouts[2]} },
+       { MODKEY,           XK_space,  setlayout,      {0} },
+       { MODKEY|ShiftMask, XK_space,  togglefloating, {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 } },
+       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|ShiftMask, XK_q,      quit,           {0} },
        /***************************************************************/
        { MODKEY|ControlMask, XK_Return, spawn, SHCMD("emacsclient -c") },
        { MODKEY|ControlMask, XK_q,      spawn, EMACS("(progn (switch-to-buffer \"*scratch*\") (mu4e))") },