jab2870/dwm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Pushing dwm changes

Browse source
This commit is contained in:
Jonathan Hodgson 2024-02-15 11:20:43 +00:00
parent 3deebe7302
commit 73ba8c61bf
1 changed files with 67 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

124
config.def.h
View file

@ -77,20 +77,13 @@ static const char *dmenucmd[] = { "launcher", NULL };
//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 *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
static const char *termcmd[] = { "folder-shell", NULL }; static const char *termcmd[] = { "folder-shell", NULL };
static const char *lfcmd[] = { "folder-shell", "lf", NULL };
static const char *fullscreenshot[] = { "screenshot", NULL }; static const char *fullscreenshot[] = { "screenshot", NULL };
static const char *activescreenshot[] = { "screenshot", "window", NULL }; static const char *activescreenshot[] = { "screenshot", "window", NULL };
static const char *selectscreenshot[] = { "screenshot", "select", NULL }; static const char *selectscreenshot[] = { "screenshot", "select", NULL };
static const char *selectscreenrecord[] = { "screenrecord", "select", NULL }; static const char *selectscreenrecord[] = { "screenrecord", "select", NULL };
static const char *greenclip[] = { "rofi", "-modi", "clipboard:greenclip print", "-show", "clipboard", "-run-command", "{cmd}", NULL };
static const char *qutebrowser[] = { "qutebrowser", NULL };
static const char *surf[] = { "tabbed", "-c", "surf", "-e", NULL };
static const char *chromium[] = { "chromium", NULL }; static const char *chromium[] = { "chromium", NULL };
static const char *bigchromium[] = { "chromium", "--force-device-scale-factor=2", NULL };
static const char *firefox[] = { "firefox-developer-edition", NULL }; static const char *firefox[] = { "firefox-developer-edition", NULL };
static const char *date[] = { "datetime", NULL }; static const char *date[] = { "datetime", NULL };
@ -103,7 +96,6 @@ static const char *playpause[] = { "playerctl", "play-pause", NULL };
static const char *logout[] = { "rofi-shutdown", NULL }; static const char *logout[] = { "rofi-shutdown", NULL };
static const char *offlineArchWiki[] = { "offline-aw", NULL };
static const char *manPages[] = { "man-page-pdf", NULL }; static const char *manPages[] = { "man-page-pdf", NULL };
static const char *ports[] = { "ports", NULL }; static const char *ports[] = { "ports", NULL };
@ -121,8 +113,6 @@ static const char *volumeToggle[] = { "volume", "toggle", NULL };
static const char *brightnessUp[] = { "brightness", "up", NULL }; static const char *brightnessUp[] = { "brightness", "up", NULL };
static const char *brightnessDown[] = { "brightness", "down", NULL }; static const char *brightnessDown[] = { "brightness", "down", NULL };
static const char *setBackgroundRandom[] = { "rofi-background", "--earth", NULL };
static const char *backgroundDetails[] = { "background", "--only-notify", NULL };
static const char *lockScreen[] = { "screenlock", "--suspend", NULL }; static const char *lockScreen[] = { "screenlock", "--suspend", NULL };
static const char *powerMenu[] = { "rofi-shutdown", NULL }; static const char *powerMenu[] = { "rofi-shutdown", NULL };
@ -132,6 +122,9 @@ static const char *toggleKeyboard[] = { "toggleKeyboard", NULL };
static const char *actOnLast[] = { "actOnLast", NULL }; static const char *actOnLast[] = { "actOnLast", NULL };
static const char *actOnLastDefault[] = { "actOnLast", "--first", NULL }; static const char *actOnLastDefault[] = { "actOnLast", "--first", NULL };
static const char *dunstClose[] = { "dunstctl", "close", NULL };
static const char *dunstOpenLast[] = { "dunstctl", "history-pop", NULL };
#include "movestack.c" #include "movestack.c"
#define MULTIKEY_THRESHOLD_MS_PRESS 200 #define MULTIKEY_THRESHOLD_MS_PRESS 200
@ -140,72 +133,87 @@ static const char *actOnLastDefault[] = { "actOnLast", "--first", NULL };
static Key keys[] = { static Key keys[] = {
/* modifier key count function argument */ /* modifier key count function argument */
{ MODKEY, XK_p, 0, spawn, {.v = dmenucmd } },
{ MODKEY, XK_Return, 0, spawn, {.v = termcmd } }, { MODKEY, XK_Return, 0, spawn, {.v = termcmd } },
{ MODKEY|ControlMask, XK_Return, 0, spawn, {.v = lfcmd } }, //{ MODKEY|ShiftMask, XK_Return, 0, zoom, {0} },
{ MODKEY, XK_b, 0, togglebar, {0} },
{ MODKEY, XK_j, 0, focusstack, {.i = +1 } },
{ MODKEY, XK_k, 0, focusstack, {.i = -1 } },
{ MODKEY|ShiftMask, XK_j, 0, movestack, {.i = +1 } },
{ MODKEY|ShiftMask, XK_k, 0, movestack, {.i = -1 } },
{ MODKEY, XK_i, 0, incnmaster, {.i = +1 } },
{ MODKEY|ShiftMask, XK_i, 0, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, 0, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, 0, setmfact, {.f = +0.05} },
{ MODKEY|ShiftMask, XK_l, 0, spawn, {.v = logout} },
{ MODKEY|ShiftMask, XK_Return, 0, zoom, {0} },
{ MODKEY, XK_Tab, 0, toggleAttachBelow, {0} }, { MODKEY, XK_Tab, 0, toggleAttachBelow, {0} },
{ MODKEY, XK_q, 0, killclient, {0} }, { MODKEY|ShiftMask, XK_Tab, 0, spawn, {.v = dunstOpenLast} },
{ MODKEY, XK_t, 0, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_m, 0, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_space, 0, spawn, {.v = dunstClose} },
{ MODKEY|ShiftMask, XK_t, 0, setlayout, {.v = &layouts[3]} },
{ MODKEY|ShiftMask, XK_a, 0, spawn, {.v = screenlayout } },
{ MODKEY, XK_b, 0, togglebar, {0} },
{ MODKEY|ShiftMask, XK_b, 0, spawn, {.v = battery} },
{ MODKEY, XK_c, 0, spawn, {.v = firefox } },
{ MODKEY|ShiftMask, XK_c, 0, spawn, {.v = chromium } },
{ MODKEY, XK_d, 0, spawn, {.v = pass } },
{ MODKEY|ShiftMask, XK_d, 0, spawn, {.v = date } },
{ MODKEY, XK_f, 0, setlayout, {.v = &layouts[4]} }, { MODKEY, XK_f, 0, setlayout, {.v = &layouts[4]} },
{ MODKEY|ShiftMask, XK_f, 0, setlayout, {.v = &layouts[5]} }, { MODKEY|ShiftMask, XK_f, 0, setlayout, {.v = &layouts[5]} },
{ MODKEY, XK_space, 0, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, 0, togglefloating, {0} }, { MODKEY, XK_h, 0, setmfact, {.f = -0.05} },
{ MODKEY, XK_0, 0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, 0, tag, {.ui = ~0 } }, { MODKEY, XK_i, 0, incnmaster, {.i = +1 } },
{ MODKEY|ShiftMask, XK_i, 0, incnmaster, {.i = -1 } },
{ MODKEY, XK_j, 0, focusstack, {.i = +1 } },
{ MODKEY|ShiftMask, XK_j, 0, movestack, {.i = +1 } },
{ MODKEY, XK_k, 0, focusstack, {.i = -1 } },
{ MODKEY|ShiftMask, XK_k, 0, movestack, {.i = -1 } },
{ MODKEY, XK_l, 0, setmfact, {.f = +0.05} },
{ MODKEY|ShiftMask, XK_l, 0, spawn, {.v = logout} },
{ MODKEY, XK_m, 0, setlayout, {.v = &layouts[2]} },
{ MODKEY|ShiftMask, XK_m, 0, spawn, {.v = manPages } },
{ MODKEY, XK_o, 0, spawn, {.v = actOnLast } },
{ MODKEY|ShiftMask, XK_o, 0, spawn, {.v = actOnLastDefault } },
{ MODKEY, XK_p, 0, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_p, 0, spawn, {.v = ports } },
{ MODKEY, XK_q, 0, killclient, {0} },
{ MODKEY|ShiftMask, XK_r, 0, quit, {0} },
{ MODKEY, XK_t, 0, setlayout, {.v = &layouts[0]} },
{ MODKEY|ShiftMask, XK_t, 0, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_u, 0, spawn, {.v = unicode } },
{ MODKEY, XK_w, 0, spawn, {.v = whichproject } },
{ MODKEY|ShiftMask, XK_w, 0, spawn, {.v = project } },
{ MODKEY, XK_y, 0, spawn, {.v = youtube } },
{ MODKEY, XK_comma, 0, focusmon, {.i = -1 } }, { MODKEY, XK_comma, 0, focusmon, {.i = -1 } },
{ MODKEY, XK_period, 0, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, 0, tagmon, {.i = -1 } }, { MODKEY|ShiftMask, XK_comma, 0, tagmon, {.i = -1 } },
{ MODKEY, XK_period, 0, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_period, 0, tagmon, {.i = +1 } }, { MODKEY|ShiftMask, XK_period, 0, tagmon, {.i = +1 } },
{ 0, XK_Print, 0, spawn, {.v = fullscreenshot } }, { 0, XK_Print, 0, spawn, {.v = fullscreenshot } },
{ ControlMask, XK_Print, 0, spawn, {.v = activescreenshot } }, { ControlMask, XK_Print, 0, spawn, {.v = activescreenshot } },
{ ShiftMask, XK_Print, 0, spawn, {.v = selectscreenshot } }, { ShiftMask, XK_Print, 0, spawn, {.v = selectscreenshot } },
{ 0, XK_F10, 0, spawn, {.v = fullscreenshot } }, { 0, XK_F10, 0, spawn, {.v = fullscreenshot } },
{ ControlMask, XK_F10, 0, spawn, {.v = activescreenshot } }, { ControlMask, XK_F10, 0, spawn, {.v = activescreenshot } },
{ ShiftMask, XK_F10, 0, spawn, {.v = selectscreenshot } }, { ShiftMask, XK_F10, 0, spawn, {.v = selectscreenshot } },
{ 0, XF86XK_AudioPlay, 0, spawn, {.v = playpause } }, { 0, XF86XK_AudioPlay, 0, spawn, {.v = playpause } },
{ 0, XF86XK_AudioPause, 0, spawn, {.v = playpause } }, { 0, XF86XK_AudioPause, 0, spawn, {.v = playpause } },
{ MODKEY|ShiftMask, XK_d, 0, spawn, {.v = date } },
{ MODKEY|ShiftMask, XK_b, 0, spawn, {.v = battery} },
{ MODKEY|ShiftMask, XK_Insert, 0, spawn, {.v = greenclip } },
//Applications
{ MODKEY|ShiftMask, XK_q, 0, spawn, {.v = qutebrowser } },
{ MODKEY, XK_s, 0, spawn, {.v = surf } },
{ MODKEY, XK_c, 0, spawn, {.v = firefox } },
{ MODKEY|ShiftMask, XK_c, 0, spawn, {.v = chromium } },
//Dmenu / Rofi
{ MODKEY, XK_u, 0, spawn, {.v = unicode } },
{ MODKEY, XK_y, 0, spawn, {.v = youtube } },
{ MODKEY, XK_a, 0, spawn, {.v = offlineArchWiki } },
{ MODKEY|ShiftMask, XK_a, 0, spawn, {.v = screenlayout } },
{ MODKEY|ShiftMask, XK_m, 0, spawn, {.v = manPages } },
{ MODKEY|ShiftMask, XK_p, 0, spawn, {.v = ports } },
{ MODKEY, XK_w, 0, spawn, {.v = whichproject } },
{ MODKEY|ShiftMask, XK_w, 0, spawn, {.v = project } },
{ MODKEY, XK_d, 0, spawn, {.v = pass } },
{ MODKEY, XK_o, 0, spawn, {.v = actOnLast } },
{ MODKEY|ShiftMask, XK_o, 0, spawn, {.v = actOnLastDefault } },
//Background
{ MODKEY, XK_e, 0, spawn, {.v = setBackgroundRandom } },
{ MODKEY|ControlMask, XK_e, 0, spawn, {.v = backgroundDetails } },
//Special keys
{ 0, XF86XK_AudioRaiseVolume, 0, spawn, {.v = volumeUp } }, { 0, XF86XK_AudioRaiseVolume, 0, spawn, {.v = volumeUp } },
{ 0, XF86XK_AudioLowerVolume, 0, spawn, {.v = volumeDown } }, { 0, XF86XK_AudioLowerVolume, 0, spawn, {.v = volumeDown } },
{ 0, XF86XK_AudioMute, 0, spawn, {.v = volumeToggle } }, { 0, XF86XK_AudioMute, 0, spawn, {.v = volumeToggle } },
{ 0, XF86XK_MonBrightnessUp, 0, spawn, {.v = brightnessUp } }, { 0, XF86XK_MonBrightnessUp, 0, spawn, {.v = brightnessUp } },
{ 0, XF86XK_MonBrightnessDown, 0, spawn, {.v = brightnessDown } }, { 0, XF86XK_MonBrightnessDown, 0, spawn, {.v = brightnessDown } },
{ MODKEY, XK_Right, 0, shiftview, {.i = 1 } }, { MODKEY, XK_Right, 0, shiftview, {.i = 1 } },
{ MODKEY, XK_Left, 0, shiftview, {.i = -1 } }, { MODKEY, XK_Left, 0, shiftview, {.i = -1 } },
// On the pinephone, I want a single press of the power button to put the phone in sleep mode. // On the pinephone, I want a single press of the power button to put the phone in sleep mode.
@ -215,7 +223,6 @@ static Key keys[] = {
{ 0, XF86XK_PowerOff, 1, spawn, {.v = lockScreen } }, { 0, XF86XK_PowerOff, 1, spawn, {.v = lockScreen } },
{ 0, XF86XK_PowerOff, 2, spawn, {.v = toggleKeyboard } }, { 0, XF86XK_PowerOff, 2, spawn, {.v = toggleKeyboard } },
{ 0, XF86XK_PowerOff, 3, spawn, {.v = powerMenu } }, { 0, XF86XK_PowerOff, 3, spawn, {.v = powerMenu } },
{ MODKEY|ShiftMask, XK_r, 0, quit, {0} },
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)
@ -226,6 +233,9 @@ static Key keys[] = {
TAGKEYS( XK_7, 6) TAGKEYS( XK_7, 6)
TAGKEYS( XK_8, 7) TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8) TAGKEYS( XK_9, 8)
{ MODKEY, XK_0, 0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, 0, tag, {.ui = ~0 } },
}; };
/* button definitions */ /* button definitions */