diff --git a/config.def.h b/config.def.h index 17c82a0..82cdda9 100644 --- a/config.def.h +++ b/config.def.h @@ -1,7 +1,7 @@ /* See LICENSE file for copyright and license details. */ /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ @@ -9,18 +9,20 @@ static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ static const int showsystray = 1; /* 0 means no systray */ 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 int topbar = 0; /* 0 means bottom bar */ +static const char *fonts[] = { "LiterationMono Nerd Font Mono:size=11" }; +static const char dmenufont[] = "LiterationMono Nerd Font Mono:size=11"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; +static const char col_main[] = "#383838"; +static const char col_background[] = "#151515"; +static const char col_alert[] = "#a55"; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_background, col_gray2 }, + [SchemeSel] = { col_gray4, col_main, col_alert }, }; /* tagging */ @@ -31,9 +33,10 @@ static const Rule rules[] = { * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title */ - /* class instance title tags mask iscentered isfloating monitor */ - { "Gimp", NULL, NULL, 0, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, + /* class instance title tags mask iscentered isfloating monitor */ + { "Arandr", NULL, NULL, 0, 1, 1, -1 }, + { "mpv", NULL, NULL, 0, 1, 1, -1 }, + { "Pavucontrol", NULL, NULL, 0, 1, 1, -1 }, }; /* layout(s) */ @@ -64,10 +67,25 @@ static const Layout layouts[] = { /* commands */ 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 char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_background, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, "-nhb", col_background, "-shb", col_main, NULL }; +static const char *termcmd[] = { "kitty", NULL }; +static const char *passcmd[] = { "passmenu", "-l", "10", "-m", dmenumon, "-fn", dmenufont, "-nb", col_background, "-nf", col_gray3, "-sb", col_alert, "-sf", col_gray4, "-nhb", col_background, "-shb", col_main, NULL }; +static const char *rangercmd[] = { "kitty", "-e", "ranger", NULL }; + +static const char *xkbmapus[] = { "setxkbmap", "us", NULL }; +static const char *xkbmapcz[] = { "setxkbmap", "cz", "qwerty", NULL }; + +static const char *mixercmd[] = { "pavucontrol", NULL }; +static const char *volup[] = { "pamixer", "--increase", "5", NULL }; +static const char *voldown[] = { "pamixer", "--decrease", "5", NULL }; + +static const char *mpcstop[] = { "mpc", "stop", NULL }; +static const char *mpctoggle[] = { "mpc", "toggle", NULL }; +static const char *mpcprev[] = { "mpc", "prev", NULL }; +static const char *mpcnext[] = { "mpc", "next", NULL }; #include "movestack.c" +#include static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, @@ -87,8 +105,8 @@ static const Key keys[] = { { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_u, setlayout, {.v = &layouts[3]} }, - { MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, + { MODKEY, XK_n, setlayout, {.v = &layouts[3]} }, + { MODKEY, XK_v, setlayout, {.v = &layouts[4]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, @@ -106,7 +124,22 @@ static const Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY|ShiftMask, XK_End, quit, {0} }, + + { MODKEY, XK_o, spawn, {.v = passcmd } }, + { MODKEY, XK_u, spawn, {.v = xkbmapus } }, + { MODKEY, XK_c, spawn, {.v = xkbmapcz } }, + { MODKEY, XK_a, spawn, {.v = mixercmd } }, + { MODKEY, XK_r, spawn, {.v = rangercmd } }, + { 0, XF86XK_AudioStop, spawn, {.v = mpcstop } }, + { 0, XF86XK_AudioPlay, spawn, {.v = mpctoggle } }, + { 0, XF86XK_AudioPrev, spawn, {.v = mpcprev } }, + { 0, XF86XK_AudioNext, spawn, {.v = mpcnext } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volup } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldown } }, + { MODKEY, XK_Pause, spawn, SHCMD("setxkbmap us; slock & sleep 0.2; loginctl suspend") }, + { 0, XK_Print, spawn, SHCMD("shotgun $(slop -f '-i %i -g %g') - | tee /home/$USER/scrot/$(date +'%F_%T').png | xclip -t 'image/png' -selection c") }, + { 0, XK_Print, spawn, SHCMD("shotgun - | tee /home/$USER/scrot/$(date +'%F_%T').png | xclip -t 'image/png' -selection c") }, }; /* button definitions */