Merge branch 'main' of git.snaile.de:luca/dwm-custom
ci/woodpecker/tag/woodpecker Pipeline was successful Details

This commit is contained in:
Luca Bilke 2024-03-18 08:31:17 +01:00
commit acfc0c890f
No known key found for this signature in database
GPG Key ID: B753481DA0B6FA47
2 changed files with 23 additions and 21 deletions

View File

@ -142,14 +142,15 @@ static const char *const autostart[] = {
NULL
};
static const char *spterm[] = { "t", TERM, "-n", "spterm", TERM_FLAG_EXEC, "tmux", NULL };
static const char *spfile[] = { "f", TERM, "-n", "spfile", TERM_FLAG_EXEC, "lfX", NULL };
static const char *spproc[] = { "p", TERM, "-n", "spproc", TERM_FLAG_EXEC, "btm", NULL };
static const char *spvolm[] = { "v", TERM, "-n", "spvolm", TERM_FLAG_EXEC, "ncpamixer", NULL };
static const char *sphelp[] = { "h", TERM, "-n", "sphelp", TERM_FLAG_EXEC, "/bin/sh", "-c", "glow -p -s $XDG_CONFIG_HOME/glow/style.json /usr/share/dwm/dwm.md", NULL };
static const char *spinet[] = { "i", TERM, "-n", "spinet", TERM_FLAG_EXEC, "nmtui", NULL };
static const char *spwiki[] = { "w", TERM, "-n", "spwiki", TERM_FLAG_EXEC, "zk", "edit", "-i", NULL };
static const char *spcalc[] = { "c", TERM, "-n", "spcalc", TERM_FLAG_EXEC, "bc", "-li", NULL };
static const char *spterm[] = { "t", TERM, "-c", "spterm", TERM_FLAG_EXEC, "tmux", NULL };
static const char *spfile[] = { "f", TERM, "-c", "spfile", TERM_FLAG_EXEC, "lfX", NULL };
static const char *spproc[] = { "p", TERM, "-c", "spproc", TERM_FLAG_EXEC, "btm", NULL };
static const char *spdisk[] = { "d", TERM, "-c", "spdisk", TERM_FLAG_EXEC, "gdu", NULL };
static const char *spvolm[] = { "v", TERM, "-c", "spvolm", TERM_FLAG_EXEC, "ncpamixer", NULL };
static const char *sphelp[] = { "h", TERM, "-c", "sphelp", TERM_FLAG_EXEC, "/bin/sh", "-c", "glow -p -s $XDG_CONFIG_HOME/glow/style.json /usr/share/dwm/dwm.md", NULL };
static const char *spinet[] = { "i", TERM, "-c", "spinet", TERM_FLAG_EXEC, "nmtui", NULL };
static const char *spwiki[] = { "w", TERM, "-c", "spwiki", TERM_FLAG_EXEC, "zk", "edit", "-i", NULL };
static const char *spcalc[] = { "c", TERM, "-c", "spcalc", TERM_FLAG_EXEC, "bc", "-li", NULL };
static char *tagicons[][NUMTAGS] =
{
@ -172,14 +173,15 @@ static const Rule rules[] = {
RULE(.class = "mpv", .isfloating = 0)
RULE(.class = "Ferdium", .monitor = 1, .tags = 1 << 0)
RULE(.class = "Thunderbird", .monitor = 1, .tags = 1 << 1)
RULE(.instance = "sphelp", .scratchkey = 'h', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 40% 80%")
RULE(.instance = "spcalc", .scratchkey = 'c', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 40% 80%")
RULE(.instance = "spterm", .scratchkey = 't', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.instance = "spfile", .scratchkey = 'f', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.instance = "spproc", .scratchkey = 'p', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.instance = "spwiki", .scratchkey = 'w', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.instance = "spvolm", .scratchkey = 'v', .isfloating = 1, .floatpos = "100% 100% 900W 600H")
RULE(.instance = "spinet", .scratchkey = 'i', .isfloating = 1, .floatpos = "100% 100% 800W 800H")
RULE(.class = "sphelp", .scratchkey = 'h', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 40% 80%")
RULE(.class = "spcalc", .scratchkey = 'c', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 40% 80%")
RULE(.class = "spterm", .scratchkey = 't', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.class = "spfile", .scratchkey = 'f', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.class = "spdisk", .scratchkey = 'd', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.class = "spproc", .scratchkey = 'p', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.class = "spwiki", .scratchkey = 'w', .isfloating = 1, .iscentered = 1, .floatpos = "50% 50% 80% 80%")
RULE(.class = "spvolm", .scratchkey = 'v', .isfloating = 1, .floatpos = "100% 100% 900W 600H")
RULE(.class = "spinet", .scratchkey = 'i', .isfloating = 1, .floatpos = "100% 100% 800W 800H")
};
/* Bar rules allow you to configure what is shown where on the bar, as well as
@ -351,7 +353,7 @@ static const Key keys[] = {
{ MODKEY | ShiftMask, XK_j, pushstack, {.i = INC(+1)} },
{ MODKEY, XK_k, focusstack, {.i = INC(-1)} },
{ MODKEY | ShiftMask, XK_k, pushstack, {.i = INC(-1)} },
// { MODKEY, XK_x, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_x, togglefloating, {0} },
// { MODKEY | ShiftMask, XK_x, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_b, togglescratch, {.v = spinet} },
// { MODKEY | ShiftMask, XK_b, spawn, {.v = (const char *[]){NULL}} },
@ -359,9 +361,9 @@ static const Key keys[] = {
// { MODKEY | ShiftMask, XK_m, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_w, togglescratch, {.v = spwiki} },
// { MODKEY | ShiftMask, XK_w, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_v, togglescratch, {.v = spcalc }},
{ MODKEY, XK_v, togglescratch, {.v = spcalc} },
// { MODKEY | ShiftMask, XK_v, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_z, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_z, togglescratch, {.v = spdisk} },
// { MODKEY | ShiftMask, XK_z, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_space, spawn, {.v = termcmd} },
{ MODKEY | ShiftMask, XK_space, togglescratch, {.v = spterm} },
@ -430,7 +432,7 @@ static const Key keys[] = {
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = {
/* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, layoutmenu, {0} },
{ ClkLtSymbol, 0, Button3, layoutmenu, {0} },
// { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
// { ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },

2
todo
View File

@ -1,3 +1,3 @@
# TODO: customize layoutmenu patch
# BUG: Renewing DWM doesn't kill autostart processes
# TODO: increase stext buffer size for sb-cpu
# TODO: focus master hotkey