From d73da3001607038de4c58c3285219cecdcdfc664 Mon Sep 17 00:00:00 2001 From: Nathan Steel Date: Sat, 13 Nov 2021 13:43:56 +0000 Subject: [PATCH] Add custom config/commands - Gruvbox colours - Higher font size - Custom commands for ease-of-use --- config.def.h | 70 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/config.def.h b/config.def.h index fcf985c..6540191 100644 --- a/config.def.h +++ b/config.def.h @@ -7,17 +7,15 @@ static const unsigned int snap = 32; /* snap pixel */ static const int swallowfloating = 0; /* 1 means swallow floating windows by default */ 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 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 *fonts[] = { "monospace:size=12" }; +static const char dmenufont[] = "monospace:size=12"; +static const char col_green[] = "#98971a"; +static const char col_black[] = "#282828"; +static const char col_grey[] = "#a89984"; static const char *colors[][3] = { /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, + [SchemeNorm] = { col_grey, col_black, col_black }, + [SchemeSel] = { col_black, col_green, col_green }, }; /* tagging */ @@ -30,7 +28,7 @@ static const Rule rules[] = { */ /* class instance title tags mask isfloating isterminal noswallow monitor */ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 }, + { "Firefox", NULL, NULL, 0, 0, 0, -1, -1 }, { "st", NULL, NULL, 0, 0, 1, -1, -1 }, { NULL, NULL, "Event Tester", 0, 1, 0, 1, -1 }, /* xev */ }; @@ -61,13 +59,56 @@ 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_black, "-nf", col_grey, "-sb", col_green, "-sf", col_black, NULL }; +static const char *htop[] = { "st", "htop", NULL }; +static const char *neofetch[] = { "st", "neofetch", NULL }; +static const char *filemanager[] = { "st", "lf", NULL }; +static const char *vim[] = { "st", "vim", NULL }; +static const char *newsboat[] = { "st", "newsboat", NULL }; +static const char *musicclient[] = { "st", "ncmpcpp", NULL }; +static const char *mailclient[] = { "st", "neomutt", NULL }; +static const char *torrentclient[] = { "st", "transmission-remote-cli", NULL }; static Key keys[] = { /* modifier key function argument */ + /* Spawn Controls */ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, SHCMD("$TERM || st") }, + { MODKEY, XK_e, spawn, {.v = filemanager } }, + { MODKEY, XK_z, spawn, {.v = htop } }, + { MODKEY|ShiftMask, XK_z, spawn, {.v = neofetch } }, + { MODKEY, XK_n, spawn, {.v = newsboat } }, + { MODKEY, XK_v, spawn, {.v = vim } }, + { MODKEY, XK_w, spawn, SHCMD("$BROWSER") }, + { MODKEY|ControlMask, XK_w, spawn, SHCMD("firefox") }, + { MODKEY, XK_g, spawn, SHCMD("gimp") }, + { MODKEY|ControlMask, XK_t, spawn, {.v = torrentclient } }, + { MODKEY|ControlMask, XK_v, spawn, SHCMD("virt-manager") }, + { MODKEY|ControlMask, XK_m, spawn, {.v = musicclient } }, + { MODKEY|ControlMask, XK_e, spawn, {.v = mailclient } }, + /* Audio Controls */ + { MODKEY|ShiftMask, XK_i, spawn, SHCMD("amixer set Master 5%+") }, + { MODKEY|ShiftMask, XK_d, spawn, SHCMD("amixer set Master 5%-") }, + { MODKEY|ShiftMask, XK_m, spawn, SHCMD("amixer -D pulse set Master toggle") }, + /* Music Controls (mpd) */ + { MODKEY|ShiftMask, XK_p, spawn, SHCMD("mpc toggle") }, + { MODKEY, XK_bracketright, spawn, SHCMD("mpc next") }, + { MODKEY, XK_bracketleft, spawn, SHCMD("mpc prev") }, + { MODKEY|ShiftMask, XK_bracketright, spawn, SHCMD("mpc seek +5") }, + { MODKEY|ShiftMask, XK_bracketleft, spawn, SHCMD("mpc seek -5") }, + /* Screencap Controls */ + { MODKEY, XK_c, spawn, SHCMD("dmenu_record") }, + { MODKEY|ShiftMask, XK_c, spawn, SHCMD("dmenu_record end") }, + { MODKEY, XK_s, spawn, SHCMD("maim ~/pictures/screenshots/$(date +%d%m%Y-%H%M%S).png") }, + { MODKEY|ShiftMask, XK_s, spawn, SHCMD("maim -s ~/pictures/screenshots/$(date +%d%m%Y-%H%M%S).png") }, + { MODKEY|ControlMask, XK_k, spawn, SHCMD("killall screenkey || screenkey") }, + /* Other Controls */ + { MODKEY|ControlMask, XK_l, spawn, SHCMD("slock") }, + { MODKEY, XK_apostrophe, spawn, SHCMD("dmenu_VPN") }, + { MODKEY, XK_semicolon, spawn, SHCMD("dmenu_SSH") }, + { MODKEY, XK_slash, spawn, SHCMD("dmenu_scripts") }, + { MODKEY, XK_y, spawn, SHCMD("dmenu_ytd") }, + { MODKEY, XK_r, spawn, SHCMD("dmenu_display") }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -77,7 +118,7 @@ static Key keys[] = { { 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_q, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, @@ -111,7 +152,6 @@ static Button buttons[] = { { ClkLtSymbol, 0, Button1, setlayout, {0} }, { 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} },