From e9d35d1d9b5c2487713cf89e7a78c12cb14ff257 Mon Sep 17 00:00:00 2001 From: cb Date: Sun, 13 Nov 2022 15:57:51 +0000 Subject: [PATCH] config - adapt shortcuts --- config.h | 171 +++++++++++++++++++------------------------------------ 1 file changed, 60 insertions(+), 111 deletions(-) diff --git a/config.h b/config.h index 88ef0b0..bf6e74f 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ /* Constants */ #define TERMINAL "st" #define TERMCLASS "St" -#define BROWSER "librewolf" +#define BROWSER "brave" /* appearance */ static unsigned int borderpx = 3; /* border pixel of windows */ @@ -21,7 +21,7 @@ static char normbgcolor[] = "#222222"; static char normbordercolor[] = "#444444"; static char normfgcolor[] = "#bbbbbb"; static char selfgcolor[] = "#eeeeee"; -static char selbordercolor[] = "#770000"; +static char selbordercolor[] = "#4da5ff"; static char selbgcolor[] = "#005577"; static char *colors[][3] = { /* fg bg border */ @@ -93,10 +93,6 @@ static const Layout layouts[] = { { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ { MOD, XK_v, ACTION##stack, {.i = 0 } }, \ - /* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */ - /* { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ */ - /* { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ */ - /* { MOD, XK_x, ACTION##stack, {.i = -1 } }, */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -150,94 +146,9 @@ static Key keys[] = { TAGKEYS( XK_ccedilla, 8) { MODKEY, XK_agrave, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_agrave, tag, {.ui = ~0 } }, - { MODKEY, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY|ShiftMask, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY|ShiftMask, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_BackSpace, spawn, {.v = (const char*[]){ "sysact", NULL } } }, - { MODKEY|ShiftMask, XK_BackSpace, spawn, {.v = (const char*[]){ "sysact", NULL } } }, - { MODKEY, XK_Tab, view, {0} }, - /* { MODKEY|ShiftMask, XK_Tab, spawn, SHCMD("") }, */ - { MODKEY, XK_q, killclient, {0} }, - { MODKEY|ShiftMask, XK_q, spawn, {.v = (const char*[]){ "sysact", NULL } } }, - { MODKEY, XK_w, spawn, {.v = (const char*[]){ BROWSER, NULL } } }, - { MODKEY|ShiftMask, XK_w, spawn, {.v = (const char*[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } }, - { MODKEY, XK_e, spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") }, - { MODKEY|ShiftMask, XK_e, spawn, SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile ~/.config/abook/addressbook") }, - { MODKEY, XK_r, spawn, {.v = (const char*[]){ TERMINAL, "-e", "lfub", NULL } } }, - { MODKEY|ShiftMask, XK_r, spawn, {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, /* tile */ - { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */ - { MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */ - { MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */ - { MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */ - { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */ - { MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */ - { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */ - { MODKEY, XK_o, incnmaster, {.i = +1 } }, - { MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } }, - { MODKEY, XK_p, spawn, {.v = (const char*[]){ "mpc", "toggle", NULL } } }, - { MODKEY|ShiftMask, XK_p, spawn, SHCMD("mpc pause; pauseallmpv") }, - { MODKEY, XK_bracketleft, spawn, {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } }, - { MODKEY|ShiftMask, XK_bracketleft, spawn, {.v = (const char*[]){ "mpc", "seek", "-60", NULL } } }, - { MODKEY, XK_bracketright, spawn, {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } }, - { MODKEY|ShiftMask, XK_bracketright, spawn, {.v = (const char*[]){ "mpc", "seek", "+60", NULL } } }, - { MODKEY, XK_backslash, view, {0} }, - /* { MODKEY|ShiftMask, XK_backslash, spawn, SHCMD("") }, */ - { MODKEY, XK_a, togglegaps, {0} }, - { MODKEY|ShiftMask, XK_a, defaultgaps, {0} }, - { MODKEY, XK_s, togglesticky, {0} }, - /* { MODKEY|ShiftMask, XK_s, spawn, SHCMD("") }, */ - { MODKEY, XK_d, spawn, {.v = (const char*[]){ "dmenu_run", NULL } } }, - { MODKEY|ShiftMask, XK_d, spawn, {.v = (const char*[]){ "passmenu", NULL } } }, - { MODKEY, XK_f, togglefullscr, {0} }, - { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[8]} }, - { MODKEY, XK_g, shiftview, { .i = -1 } }, - { MODKEY|ShiftMask, XK_g, shifttag, { .i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - /* J and K are automatically bound above in STACKEYS */ - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_semicolon, shiftview, { .i = 1 } }, - { MODKEY|ShiftMask, XK_semicolon, shifttag, { .i = 1 } }, - { MODKEY, XK_apostrophe, togglescratch, {.ui = 1} }, - /* { MODKEY|ShiftMask, XK_apostrophe, spawn, SHCMD("") }, */ - { MODKEY|ShiftMask, XK_apostrophe, togglesmartgaps, {0} }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_Return, togglescratch, {.ui = 0} }, - - { MODKEY, XK_z, incrgaps, {.i = +3 } }, - /* { MODKEY|ShiftMask, XK_z, spawn, SHCMD("") }, */ - { MODKEY, XK_x, incrgaps, {.i = -3 } }, - /* { MODKEY|ShiftMask, XK_x, spawn, SHCMD("") }, */ - { MODKEY, XK_c, spawn, {.v = (const char*[]){ TERMINAL, "-e", "profanity", NULL } } }, - /* { MODKEY|ShiftMask, XK_c, spawn, SHCMD("") }, */ - /* V is automatically bound above in STACKKEYS */ - { MODKEY, XK_b, togglebar, {0} }, - /* { MODKEY|ShiftMask, XK_b, spawn, SHCMD("") }, */ - { MODKEY, XK_n, spawn, {.v = (const char*[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", NULL } } }, - { MODKEY|ShiftMask, XK_n, spawn, SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") }, - { MODKEY, XK_m, spawn, {.v = (const char*[]){ TERMINAL, "-e", "ncmpcpp", NULL } } }, - { MODKEY|ShiftMask, XK_m, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_comma, spawn, {.v = (const char*[]){ "mpc", "prev", NULL } } }, - { MODKEY|ShiftMask, XK_comma, spawn, {.v = (const char*[]){ "mpc", "seek", "0%", NULL } } }, - { MODKEY, XK_semicolon, spawn, {.v = (const char*[]){ "mpc", "next", NULL } } }, - { MODKEY|ShiftMask, XK_semicolon, spawn, {.v = (const char*[]){ "mpc", "repeat", NULL } } }, - - { MODKEY, XK_Left, focusmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_Left, tagmon, {.i = -1 } }, - { MODKEY, XK_Right, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_Right, tagmon, {.i = +1 } }, - - { MODKEY, XK_Page_Up, shiftview, { .i = -1 } }, - { MODKEY|ShiftMask, XK_Page_Up, shifttag, { .i = -1 } }, - { MODKEY, XK_Page_Down, shiftview, { .i = +1 } }, - { MODKEY|ShiftMask, XK_Page_Down, shifttag, { .i = +1 } }, - { MODKEY, XK_Insert, spawn, SHCMD("xdotool type $(grep -v '^#' ~/.local/share/larbs/snippets | dmenu -i -l 50 | cut -d' ' -f1)") }, - - { MODKEY, XK_F1, spawn, SHCMD("groff -mom /usr/local/share/dwm/larbs.mom -Tpdf | zathura -") }, - { MODKEY, XK_F2, spawn, {.v = (const char*[]){ "tutorialvids", NULL } } }, + /* F row */ { MODKEY, XK_F3, spawn, {.v = (const char*[]){ "displayselect", NULL } } }, { MODKEY, XK_F4, spawn, SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") }, { MODKEY, XK_F5, xrdb, {.v = NULL } }, @@ -248,13 +159,67 @@ static Key keys[] = { { MODKEY, XK_F10, spawn, {.v = (const char*[]){ "dmenuumount", NULL } } }, { MODKEY, XK_F11, spawn, SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") }, { MODKEY, XK_F12, spawn, SHCMD("remaps") }, + + /* 1st row */ + { MODKEY, XK_a, togglegaps, {0} }, + { MODKEY|ShiftMask, XK_a, defaultgaps, {0} }, + { MODKEY, XK_z, incrgaps, {.i = +3 } }, + { MODKEY|ShiftMask, XK_z, incrgaps, {.i = -3 } }, + { MODKEY, XK_r, spawn, {.v = (const char*[]){ TERMINAL, "-e", "lfub", NULL } } }, + { MODKEY|ShiftMask, XK_r, spawn, {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, /* tile */ + { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */ + { MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */ + { MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */ + { MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */ + { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */ + { MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */ + { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */ + { MODKEY, XK_backslash, view, {0} }, + + /* 2nd row */ + { MODKEY, XK_q, killclient, {0} }, + { MODKEY, XK_s, togglesticky, {0} }, + { MODKEY, XK_d, spawn, {.v = (const char*[]){ "dmenu_run", NULL } } }, + { MODKEY|ShiftMask, XK_d, spawn, {.v = (const char*[]){ "passmenu", NULL } } }, + { MODKEY, XK_f, togglefullscr, {0} }, + { MODKEY, XK_g, shiftview, { .i = -1 } }, + { MODKEY|ShiftMask, XK_g, shifttag, { .i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + /* J and K are automatically bound above in STACKEYS */ + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY, XK_m, shiftview, { .i = 1 } }, + { MODKEY|ShiftMask, XK_m, shifttag, { .i = 1 } }, + + /* 3rd row */ + { MODKEY, XK_w, spawn, {.v = (const char*[]){ BROWSER, NULL } } }, + { MODKEY, XK_x, togglescratch, {.ui = 1} }, + { MODKEY|ShiftMask, XK_x, togglesmartgaps, {0} }, + /* V is automatically bound above in STACKKEYS */ + { MODKEY, XK_b, togglebar, {0} }, + + + + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_Return, togglescratch, {.ui = 0} }, + + { MODKEY, XK_Left, focusmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_Left, tagmon, {.i = -1 } }, + { MODKEY, XK_Right, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_Right, tagmon, {.i = +1 } }, + + { MODKEY, XK_Page_Up, shiftview, { .i = -1 } }, + { MODKEY|ShiftMask, XK_Page_Up, shifttag, { .i = -1 } }, + { MODKEY, XK_Page_Down, shiftview, { .i = +1 } }, + { MODKEY|ShiftMask, XK_Page_Down, shifttag, { .i = +1 } }, + { MODKEY, XK_space, zoom, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { 0, XK_Print, spawn, SHCMD("maim pic-full-$(date '+%y%m%d-%H%M-%S').png") }, - { ShiftMask, XK_Print, spawn, {.v = (const char*[]){ "maimpick", NULL } } }, + { ShiftMask, XK_Print, spawn, {.v = (const char*[]){ "maimpick", NULL } } }, { MODKEY, XK_Print, spawn, {.v = (const char*[]){ "dmenurecord", NULL } } }, - { MODKEY|ShiftMask, XK_Print, spawn, {.v = (const char*[]){ "dmenurecord", "kill", NULL } } }, + { MODKEY|ShiftMask, XK_Print, spawn, {.v = (const char*[]){ "dmenurecord", "kill", NULL } } }, { MODKEY, XK_Delete, spawn, {.v = (const char*[]){ "dmenurecord", "kill", NULL } } }, { MODKEY, XK_Scroll_Lock, spawn, SHCMD("killall screenkey || screenkey &") }, @@ -287,22 +252,6 @@ static Key keys[] = { { 0, XF86XK_MonBrightnessUp, spawn, {.v = (const char*[]){ "xbacklight", "-inc", "15", NULL } } }, { 0, XF86XK_MonBrightnessDown, spawn, {.v = (const char*[]){ "xbacklight", "-dec", "15", NULL } } }, - /* { MODKEY|Mod4Mask, XK_h, incrgaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask, XK_l, incrgaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask|ShiftMask, XK_h, incrogaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask|ShiftMask, XK_l, incrogaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask|ControlMask, XK_h, incrigaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask|ControlMask, XK_l, incrigaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask|ShiftMask, XK_agrave, defaultgaps, {0} }, */ - /* { MODKEY, XK_y, incrihgaps, {.i = +1 } }, */ - /* { MODKEY, XK_o, incrihgaps, {.i = -1 } }, */ - /* { MODKEY|ControlMask, XK_y, incrivgaps, {.i = +1 } }, */ - /* { MODKEY|ControlMask, XK_o, incrivgaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask, XK_y, incrohgaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask, XK_o, incrohgaps, {.i = -1 } }, */ - /* { MODKEY|ShiftMask, XK_y, incrovgaps, {.i = +1 } }, */ - /* { MODKEY|ShiftMask, XK_o, incrovgaps, {.i = -1 } }, */ - }; /* button definitions */