diff --git a/config.def.h b/config.def.h index 9efa774..fec1be8 100644 --- a/config.def.h +++ b/config.def.h @@ -1,12 +1,12 @@ /* See LICENSE file for copyright and license details. */ /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 4; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=10" }; -static const char dmenufont[] = "monospace:size=10"; +static const char *fonts[] = { "Ubuntu Mono:size=12" }; +static const char dmenufont[] = "Ubuntu Mono:size=12"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -19,7 +19,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" }; static const Rule rules[] = { /* xprop(1): @@ -27,8 +27,31 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + // ----- 1 ----- + { "st-256color", NULL, NULL, 0, 0, -1 }, + // ----- 2 ----- + { "Code", NULL, NULL, 1 << 1, 0, -1 }, + // ----- 3 ----- + { "thunderbird", NULL, NULL, 1 << 2, 0, -1 }, + { "KeePassXC", NULL, NULL, 1 << 2, 0, -1 }, + // ----- 4 ----- + { "vesktop", NULL, NULL, 1 << 3, 0, -1 }, + { "discord", NULL, NULL, 1 << 3, 0, -1 }, + { "KotatogramDesktop", NULL, NULL, 1 << 3, 0, -1 }, + // ----- 5 ----- + { "Steam", NULL, NULL, 1 << 4, 0, -1 }, + { "steam", NULL, NULL, 1 << 4, 0, -1 }, + { "steamwebhelper", NULL, NULL, 1 << 4, 0, -1 }, + // ----- 7 ----- + { "QjackCtl", NULL, NULL, 1 << 6, 1, -1 }, + { "PatchMatrix", NULL, NULL, 1 << 6, 0, -1 }, + { "Blueman-manager", NULL, NULL, 1 << 6, 0, -1 }, + { "corectrl", NULL, NULL, 1 << 6, 0, -1 }, + // ----- 9 ----- + { "firefox", NULL, NULL, 1 << 8, 0, -1 }, + { "librewolf-default", NULL, NULL, 1 << 8, 0, -1 }, + // ----- OTHER ----- + { "xwinwrap", NULL, NULL, 1 << 9, 0, -1 }, }; /* layout(s) */ @@ -45,56 +68,78 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod1Mask +#define SUPERKEY Mod4Mask +#define ALTKEY Mod1Mask #define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, + { SUPERKEY, KEY, view, {.ui = 1 << TAG} }, \ + { SUPERKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { SUPERKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { SUPERKEY|ControlMask|ShiftMask, KEY, 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 } } /* commands */ +static const char *screenshot[] = { "scrsht", NULL }; +static const char *screenshotarea[] = { "scrsht", "-s", NULL }; + +static const char *volup[] = { "pactl", "set-sink-volume", "0", "+5%", NULL }; +static const char *voldown[] = { "pactl", "set-sink-volume", "0", "-5%", NULL }; +static const char *volmute[] = { "pactl", "set-sink-mute", "0", "toggle", NULL }; + +static const char *backlightup[] = { "light", "-A", "10", NULL }; +static const char *backlightdown[] = { "light", "-U", "10", NULL }; + static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; static const 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} }, + /* modifier key function argument */ + { 0, XF86XK_ModeLock, spawn, {.v = lockcmd } }, + { 0, XK_Print, spawn, {.v = screenshot } }, + { ShiftMask, XK_Print, spawn, {.v = screenshotarea } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volup } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldown } }, + { 0, XF86XK_MonBrightnessUp, spawn, {.v = backlightup } }, + { 0, XF86XK_MonBrightnessDown, spawn, {.v = backlightdown } }, + { 0, XF86XK_AudioMute, spawn, {.v = volmute } }, + { SUPERKEY, XK_d, spawn, {.v = dmenucmd } }, + { SUPERKEY, XK_Return, spawn, {.v = termcmd } }, + { SUPERKEY, XK_b, togglebar, {.i = 1} }, + { SUPERKEY|ShiftMask, XK_b, togglebar, {.i = 2} }, + { ALTKEY, XK_Tab, focusstack, {.i = +1 } }, + { SUPERKEY, XK_i, incnmaster, {.i = +1 } }, + { SUPERKEY, XK_p, incnmaster, {.i = -1 } }, + { SUPERKEY, XK_o, setmfact, {.f = -0.05} }, + { SUPERKEY, XK_l, setmfact, {.f = +0.05} }, + { SUPERKEY|ShiftMask, XK_Return, zoom, {0} }, + { SUPERKEY, XK_q, killclient, {0} }, + { SUPERKEY, XK_t, setlayout, {.v = &layouts[1]} }, + { SUPERKEY, XK_f, setlayout, {.v = &layouts[2]} }, + { SUPERKEY, XK_m, setlayout, {.v = &layouts[3]} }, + { SUPERKEY|ShiftMask, XK_g, setlayout, {.v = &layouts[4]} }, + { SUPERKEY, XK_g, setlayout, {.v = &layouts[0]} }, + { SUPERKEY|ShiftMask, XK_space, togglefloating, {0} }, +// { SUPERKEY, XK_comma, focusmon, {.i = -1 } }, +// { SUPERKEY, XK_period, focusmon, {.i = +1 } }, +// { SUPERKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, +// { SUPERKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, +// { SUPERKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } }, + { SUPERKEY|ShiftMask, XK_f, togglefullscr, {0} }, + 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) + TAGKEYS( XK_0, 9) + TAGKEYS( XK_minus, 10) + TAGKEYS( XK_equal, 11) + { SUPERKEY|ShiftMask, XK_q, quitprompt, {0} }, }; /* button definitions */ @@ -105,12 +150,12 @@ static const Button buttons[] = { { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkWinTitle, 0, Button2, zoom, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, - { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, - { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkClientWin, SUPERKEY, Button1, movemouse, {0} }, + { ClkClientWin, SUPERKEY, Button2, togglefloating, {0} }, + { ClkClientWin, SUPERKEY, Button3, resizemouse, {0} }, { ClkTagBar, 0, Button1, view, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} }, - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + { ClkTagBar, SUPERKEY, Button1, tag, {0} }, + { ClkTagBar, SUPERKEY, Button3, toggletag, {0} }, };