diff options
| -rw-r--r-- | config.def.h | 67 | ||||
| -rw-r--r-- | config.mk | 1 |
2 files changed, 47 insertions, 21 deletions
diff --git a/config.def.h b/config.def.h index 8a17c11..04c0e41 100644 --- a/config.def.h +++ b/config.def.h @@ -119,12 +119,14 @@ static const int cursor_timeout = 2; /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */ #define MODKEY WLR_MODIFIER_LOGO +#define SHIFT WLR_MODIFIER_SHIFT +#define CTRL WLR_MODIFIER_CTRL #define TAGKEYS(KEY,SKEY,TAG) \ { MODKEY, -1, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_CTRL, -1, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,-1,SKEY,toggletag, {.ui = 1 << TAG} } + { MODKEY|CTRL, -1, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|CTRL|SHIFT, -1,SKEY,toggletag, {.ui = 1 << TAG} } /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -132,7 +134,7 @@ static const int cursor_timeout = 2; /* commands */ static const char *termcmd[] = { "footclient", NULL }; static const char *alttermcmd[] = { "foot", NULL }; -static const char *browsercmd[] = { "firefox", NULL }; +static const char *browsercmd[] = { "qutebrowser", NULL }; static const char *menucmd[] = { "bemenu-run", NULL }; static const char *volume_raise[] = { "volume", "raise", NULL }; @@ -145,16 +147,16 @@ static const Key keys[] = { /* Window managment */ { MODKEY, -1, XKB_KEY_d, spawn, {.v = menucmd} }, { MODKEY, -1, XKB_KEY_q, spawn, {.v = termcmd} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_Q, spawn, {.v = alttermcmd} }, + { MODKEY|SHIFT, -1, XKB_KEY_Q, spawn, {.v = alttermcmd} }, { MODKEY, -1, XKB_KEY_w, spawn, {.v = browsercmd} }, { MODKEY, -1, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, -1, XKB_KEY_k, focusstack, {.i = -1} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_H, incnmaster, {.i = +1} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_L, incnmaster, {.i = -1} }, + { MODKEY|SHIFT, -1, XKB_KEY_H, incnmaster, {.i = +1} }, + { MODKEY|SHIFT, -1, XKB_KEY_L, incnmaster, {.i = -1} }, { MODKEY, -1, XKB_KEY_h, setmfact, {.f = -0.05f} }, { MODKEY, -1, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, -1, XKB_KEY_f, togglefullscreen, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_space, togglefloating, {0} }, + { MODKEY|SHIFT, -1, XKB_KEY_space, togglefloating, {0} }, { MODKEY, -1, XKB_KEY_Return, zoom, {0} }, { MODKEY, -1, XKB_KEY_Tab, view, {0} }, { MODKEY, -1, XKB_KEY_g, togglegaps, {0} }, @@ -162,6 +164,7 @@ static const Key keys[] = { { MODKEY, -1, XKB_KEY_c, killclient, {0} }, /* Layout */ + { MODKEY, XKB_KEY_t, XKB_KEY_space, setlayout, {0} }, { MODKEY, XKB_KEY_t, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_t, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_t, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, @@ -178,6 +181,8 @@ static const Key keys[] = { { MODKEY, XKB_KEY_n, XKB_KEY_n, spawn, SHCMD("vis pop-net 10") }, { MODKEY, XKB_KEY_n, XKB_KEY_m, spawn, SHCMD("vis pop-mem 1") }, { MODKEY, XKB_KEY_n, XKB_KEY_s, spawn, SHCMD("vis pop-sens 1") }, + { MODKEY, XKB_KEY_n, XKB_KEY_w, spawn, SHCMD("vis pop-yr 600") }, + { MODKEY, XKB_KEY_n, XKB_KEY_k, spawn, SHCMD("vis pop-khal 600") }, { MODKEY, -1, XKB_KEY_Escape, spawn, SHCMD("vis dismiss") }, /* Menus */ @@ -185,28 +190,48 @@ static const Key keys[] = { { MODKEY, XKB_KEY_m, XKB_KEY_c, spawn, SHCMD("menu-clip") }, { MODKEY, XKB_KEY_m, XKB_KEY_p, spawn, SHCMD("menu-power") }, { MODKEY, XKB_KEY_m, XKB_KEY_v, spawn, SHCMD("menu-video") }, + { MODKEY, XKB_KEY_m, XKB_KEY_w, spawn, SHCMD("menu-weather") }, + { MODKEY, XKB_KEY_m, XKB_KEY_s, spawn, SHCMD("menu-symbols") }, /* Media */ - { MODKEY|WLR_MODIFIER_CTRL, -1, XKB_KEY_v, spawn, {.v = volume_mute } }, + { MODKEY|CTRL, -1, XKB_KEY_v, spawn, {.v = volume_mute } }, { MODKEY, -1, XKB_KEY_v, spawn, {.v = volume_raise } }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_V, spawn, {.v = volume_lower } }, + { MODKEY|SHIFT, -1, XKB_KEY_V, spawn, {.v = volume_lower } }, { MODKEY, -1, XKB_KEY_a, spawn, SHCMD("lampe raise") }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_A, spawn, SHCMD("lampe lower") }, + { MODKEY|SHIFT, -1, XKB_KEY_A, spawn, SHCMD("lampe lower") }, { 0, -1, XKB_KEY_XF86AudioMute, spawn, {.v = volume_mute } }, { 0, -1, XKB_KEY_XF86AudioRaiseVolume, spawn, {.v = volume_raise } }, { 0, -1, XKB_KEY_XF86AudioLowerVolume, spawn, {.v = volume_lower } }, { 0, -1, XKB_KEY_XF86AudioMicMute, spawn, SHCMD("mic mute") }, - { 0, -1, XKB_KEY_XF86RotateWindows, spawn, SHCMD("warrelrole flip") }, + { 0, -1, XKB_KEY_XF86RotateWindows, spawn, SHCMD("warrelroll flip") }, + { 0, -1, XKB_KEY_XF86TaskPane, spawn, SHCMD("warrelroll rotate") }, + { 0, -1, XKB_KEY_XF86ScreenSaver, spawn, SHCMD("lock") }, + { 0, -1, XKB_KEY_XF86MonBrightnessUp, spawn, SHCMD("lampe raise") }, + { 0, -1, XKB_KEY_XF86MonBrightnessDown, spawn, SHCMD("lampe lower") }, + { 0, -1, XKB_KEY_XF86Sleep, spawn, SHCMD("systemctl sleep") }, - - // { MODKEY, -1, XKB_KEY_space, setlayout, {0} }, + { 0, -1, XKB_KEY_XF86AudioMedia, spawn, SHCMD("playerctl play-pause") }, + { 0, -1, XKB_KEY_XF86AudioPlay, spawn, SHCMD("playerctl play-pause") }, + { 0, -1, XKB_KEY_XF86AudioPause, spawn, SHCMD("playerctl play-pause") }, + { 0, -1, XKB_KEY_XF86AudioPrev, spawn, SHCMD("playerctl previous") }, + { 0, -1, XKB_KEY_XF86AudioNext, spawn, SHCMD("playerctl next") }, { MODKEY, -1, XKB_KEY_0, view, {.ui = ~0} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_equal, tag, {.ui = ~0} }, + { MODKEY|SHIFT, -1, XKB_KEY_equal, tag, {.ui = ~0} }, { MODKEY, -1, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY, -1, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} }, + { MODKEY|SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} }, + TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), + TAGKEYS( XKB_KEY_2, XKB_KEY_quotedbl, 1), + TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), + TAGKEYS( XKB_KEY_4, XKB_KEY_currency, 3), + TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4), + TAGKEYS( XKB_KEY_6, XKB_KEY_ampersand, 5), + TAGKEYS( XKB_KEY_7, XKB_KEY_slash, 6), + TAGKEYS( XKB_KEY_8, XKB_KEY_parenleft, 7), + TAGKEYS( XKB_KEY_9, XKB_KEY_parenright, 8), +/* TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), @@ -216,15 +241,15 @@ static const Key keys[] = { TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6), TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), - { MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_M, quit, {0} }, - +*/ + { MODKEY|SHIFT, -1, XKB_KEY_M, quit, {0} }, /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ - { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_Terminate_Server, quit, {0} }, + { CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_Terminate_Server, quit, {0} }, /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is * do not remove them. */ -#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } +#define CHVT(n) { CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6), CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12), }; @@ -7,6 +7,7 @@ PKG_CONFIG = pkg-config PREFIX = /usr/local MANDIR = $(PREFIX)/share/man DATADIR = $(PREFIX)/share +CFLAGS= -O0 -g -ggdb3 XWAYLAND = XLIBS = |