summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulian T <julian@jtle.dk>2019-02-11 17:05:18 +0100
committerjulian T <julian@jtle.dk>2019-02-11 17:05:18 +0100
commit2b479b303219e2438fec521ed3ff58eec73be6b5 (patch)
treec8ed8ae71f3b55bb449d449e7d9df137b6f53442
parent7e5f1a57aa53e8b49bf53f4e038fae5e26c4b456 (diff)
parentcc65944ef831bb3e5a64f75b4547d3517f3429c7 (diff)
Merge branch 'master' into single-tagset
-rw-r--r--.gitignore1
-rw-r--r--config.h9
2 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 72c4cc2..c7f30ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
dwm
*.o
+tags
diff --git a/config.h b/config.h
index 50c6d1d..52f420a 100644
--- a/config.h
+++ b/config.h
@@ -31,6 +31,7 @@ static const Rule rules[] = {
*/
/* class instance title tags mask isfloating monitor */
{ "Thunderbird", NULL, NULL, 1 << 7, 0, -1 },
+ { "Evolution", NULL, NULL, 1 << 7, 0, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
{ "qutebrowser", NULL, NULL, 1 << 6, 0 , -1 },
};
@@ -108,16 +109,16 @@ static const char *termcmd[] = { "st", NULL };
static Key keys[] = {
/* modifier key function argument */
{ MODKEY, XK_d, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY|ShiftMask, XK_i, 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_p, incnmaster, {.i = -1 } },
+ { MODKEY, XK_p, incnmaster, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_p, incnmaster, {.i = -1 } },
{ MODKEY, XK_o, setnmaster, {.i = 1} },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
- { MODKEY, XK_Return, zoom, {0} },
+ { MODKEY, XK_i, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY|ShiftMask, XK_q, killclient, {0} },
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },