commit f1cebf11dd0f34a613e8556f607cb9f96311fd90
parent 676c18cd9ea3ace1c5169a24684a6789006f1738
Author: Markus Hanetzok <markus@hanetzok.net>
Date: Sun, 30 Mar 2025 01:00:56 +0100
update config.def.h
- sort keybindings
- add valid rule for swallow
- remove unused rules and scratchpads
Diffstat:
| M | config.def.h | | | 77 | +++++++++++++++++++++++++++++++++++++++++------------------------------------ |
1 file changed, 41 insertions(+), 36 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -34,15 +34,11 @@ typedef struct {
const char *spcmd1[] = {"st", "-n", "spterm", "-g", "120x34", NULL };
const char *spcmd2[] = {"st", "-n", "spfm", "-g", "144x41", "-e", "ranger", NULL };
const char *spcmd3[] = {"st", "-n", "pmixer", "-g", "144x41", "-e", "pulsemixer", NULL };
-const char *spcmd4[] = {"keepassxc", NULL };
-const char *spcmd5[] = {"thunar", NULL };
static Sp scratchpads[] = {
/* name cmd */
{"spterm", spcmd1},
{"spranger", spcmd2},
{"pmixer", spcmd3},
- {"keepassxc", spcmd4},
- {"thunar", spcmd5},
};
/* tagging */
@@ -53,13 +49,11 @@ static const Rule rules[] = {
* WM_NAME(STRING) = title
*/
/* class instance title tags mask isfloating isterminal noswallow monitor */
- { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
- { NULL, "Msgcompose", NULL, 0, 1, 0, 0, -1 },
- { NULL, "spterm", NULL, SPTAG(0), 1, 1, 0, -1 },
- { NULL, "spfm", NULL, SPTAG(1), 1, 1, 0, -1 },
- { NULL, "pmixer", NULL, SPTAG(2), 1, 1, 0, -1 },
- { NULL, "keepassxc", NULL, SPTAG(3), 1, 0, 0, -1 },
- { NULL, "thunar", NULL, SPTAG(4), 1, 0, 0, -1 },
+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
+ { "st-256color", NULL, NULL, 0, 0, 1, 0, -1 },
+ { NULL, "spterm", NULL, SPTAG(0), 1, 1, 0, -1 },
+ { NULL, "spfm", NULL, SPTAG(1), 1, 1, 0, -1 },
+ { NULL, "pmixer", NULL, SPTAG(2), 1, 1, 0, -1 },
};
/* layout(s) */
@@ -94,39 +88,50 @@ static const char *termcmd[] = { "st", NULL };
static const Key keys[] = {
/* modifier key function argument */
+ // general
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_space, zoom, {0} },
- { MODKEY, XK_Tab, view, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- { 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, XK_d, spawn, {.v = dmenucmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY|ShiftMask, XK_b, toggleextrabar, {0} },
- { MODKEY, XK_d, spawn, {.v = dmenucmd } },
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_g, togglegaps, {0} },
- { MODKEY|ShiftMask, XK_g, defaultgaps, {0} },
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
- { MODKEY, XK_i, togglescratch, {.ui = 4 } },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY|ShiftMask, XK_j, incrgaps, {.i = -1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY|ShiftMask, XK_k, incrgaps, {.i = +1 } },
- { MODKEY, XK_l, setmfact, {.f = +0.05} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_o, incnmaster, {.i = +1 } },
{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } },
- { MODKEY, XK_p, togglescratch, {.ui = 2 } },
{ MODKEY, XK_q, killclient, {0} },
{ MODKEY|ShiftMask, XK_q, quit, {0} },
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_u, togglescratch, {.ui = 1 } },
- { MODKEY, XK_w, setlayout, {.v = &layouts[3]} },
- { MODKEY, XK_x, togglescratch, {.ui = 3 } },
- { MODKEY, XK_y, togglescratch, {.ui = 0 } },
+
+ // layouts
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, // tile
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, // float
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, // monocle
+ { MODKEY, XK_w, setlayout, {.v = &layouts[3]} }, // tilewide
+
+ // vanity gaps
+ { MODKEY|ShiftMask, XK_g, defaultgaps, {0} },
+ { MODKEY, XK_g, togglegaps, {0} },
+ { MODKEY|ShiftMask, XK_j, incrgaps, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_k, incrgaps, {.i = +1 } },
+
+ // navigation
+ { MODKEY, XK_space, zoom, {0} },
+ { MODKEY, XK_Tab, view, {0} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+ { MODKEY, XK_l, setmfact, {.f = +0.05} },
+
+ // multi-monitor
+ { 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 } },
+
+ // scratchpads
+ { MODKEY, XK_y, togglescratch, {.ui = 0 } },
+ { MODKEY, XK_u, togglescratch, {.ui = 1 } },
+ { MODKEY, XK_p, togglescratch, {.ui = 2 } },
+
+ // tags
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
TAGKEYS( XK_1, 0)
