aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Pedroni <e.pedroni91@gmail.com>2018-10-27 11:44:47 +0200
committerEduardo Pedroni <e.pedroni91@gmail.com>2018-10-27 11:44:47 +0200
commit48d8353aa91f7c0e6b9b5f9c2083f176c4d29521 (patch)
tree49e44c5b7e34d0d548f746e694ad9481bda60feb
parent394003e76522eb73ea7f1f92fd55550ec75e58fa (diff)
parent5cf27e67c0b5984cf31ac01dbb2da7e3a0c63977 (diff)
Merge branch 'master' of git.0xf7.com:projects/dwm
-rw-r--r--config-desktop.h16
-rw-r--r--config-laptop.h13
2 files changed, 16 insertions, 13 deletions
diff --git a/config-desktop.h b/config-desktop.h
index 631ba14..59dea85 100644
--- a/config-desktop.h
+++ b/config-desktop.h
@@ -68,6 +68,8 @@ static const Rule rules[] = {
{ "Thunderbird", "Mail", NULL, 1 << 1, False, -1 },
{ "TelegramDesktop", "telegram-desktop", "Telegram", 1 << 1, False, -1 },
{ "Slack", "slack", NULL, 1 << 1, False, -1},
+ { "whatsapp-desktop", "whatsapp-desktop", NULL, 1 << 1, False, -1},
+ { "Rocket.Chat+", "rocket.chat+", NULL, 1 << 1, False, -1},
{ "Eclipse", "Eclipse", NULL, 1 << 2, False, -1 },
{ "jetbrains-idea", "sun-awt-X11-XFramePeer", NULL, 1 << 2, False, -1 },
@@ -124,10 +126,10 @@ static Key keys[] = {
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_t, spawn, {.v = browsercmd } },
{ MODKEY|ShiftMask, XK_p, spawn, {.v = playercmd } },
- { MODKEY|ShiftMask, XK_o, spawn, {.v = emailcmd } },
+ //{ MODKEY|ShiftMask, XK_o, spawn, {.v = emailcmd } },
{ MODKEY|ShiftMask, XK_i, spawn, {.v = editorcmd } },
{ MODKEY, XK_p, spawn, {.v = lockcmd } },
- { 0, XK_Print, spawn, {.v = scrotcmd } },
+ { 0, XK_Print, spawn, {.v = scrotcmd } },
{ 0, SEARCH, prodlock, {0} },
@@ -136,18 +138,18 @@ static Key keys[] = {
{ MODKEY, XK_k, incnmaster, {.i = +1 } },
{ MODKEY, XK_j, incnmaster, {.i = -1 } },
{ MODKEY|ShiftMask, XK_h, setmfact, {.f = -0.05} },
- { MODKEY|ShiftMask, XK_l , setmfact, {.f = +0.05} },
+ { MODKEY|ShiftMask, XK_l, setmfact, {.f = +0.05} },
{ MODKEY|ShiftMask, XK_Return, zoom, {0} },
- { MODKEY, XK_Tab, view, {0} },
+ //{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_e, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_r, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_w, setlayout, {.v = &layouts[2]} },
- { MODKEY, XK_space, setlayout, {0} },
+ //{ 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_0, view, {.ui = ~0 } },
+ //{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
{ MODKEY, XK_period, focusmon, {.i = +1 } },
diff --git a/config-laptop.h b/config-laptop.h
index ad18d4f..d05842a 100644
--- a/config-laptop.h
+++ b/config-laptop.h
@@ -75,6 +75,7 @@ static const Rule rules[] = {
{ "TelegramDesktop", "telegram-desktop", "Telegram", 1 << 1, False, -1 },
{ "Slack", "slack", NULL, 1 << 1, False, -1},
{ "whatsapp-desktop", "whatsapp-desktop", NULL, 1 << 1, False, -1},
+ { "Rocket.Chat+", "rocket.chat+", NULL, 1 << 1, False, -1},
{ "Eclipse", "Eclipse", NULL, 1 << 2, False, -1 },
{ "jetbrains-idea", "sun-awt-X11-XFramePeer", NULL, 1 << 2, False, -1 },
@@ -142,11 +143,11 @@ static Key keys[] = {
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_t, spawn, {.v = browsercmd } },
{ MODKEY|ShiftMask, XK_p, spawn, {.v = playercmd } },
- { MODKEY|ShiftMask, XK_o, spawn, {.v = emailcmd } },
+ //{ MODKEY|ShiftMask, XK_o, spawn, {.v = emailcmd } },
{ MODKEY|ShiftMask, XK_i, spawn, {.v = editorcmd } },
{ MODKEY, XK_p, spawn, {.v = lockcmd } },
- { 0, PRINT, spawn, {.v = scrotcmd } },
+ { 0, PRINT, spawn, {.v = scrotcmd } },
{ 0, SEARCH, prodlock, {0} },
{ 0, TPAD, spawn, {.v = toggletrackpad} },
@@ -157,16 +158,16 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_h, setmfact, {.f = -0.05} },
{ MODKEY|ShiftMask, XK_l, setmfact, {.f = +0.05} },
{ MODKEY|ShiftMask, XK_Return, zoom, {0} },
- { MODKEY, XK_Tab, view, {0} },
+ //{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_e, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_r, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_w, setlayout, {.v = &layouts[2]} },
- { MODKEY, XK_space, setlayout, {0} },
+ //{ 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_0, view, {.ui = ~0 } },
+ //{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
{ MODKEY, XK_period, focusmon, {.i = +1 } },