diff --git a/config.h b/config.h index 58a9790..f3c4213 100644 --- a/config.h +++ b/config.h @@ -122,10 +122,11 @@ static const char *const autostart[] = { static const char *spterm[] = { "t", TERM, TERM_FLAG_CLASS, "spterm", NULL }; static const char *spfile[] = { "f", TERM, TERM_FLAG_CLASS, "spfile", TERM_FLAG_EXEC, "lfX", NULL }; static const char *spproc[] = { "p", TERM, TERM_FLAG_CLASS, "spproc", TERM_FLAG_EXEC, "btm", NULL }; -static const char *spdisk[] = { "d", TERM, TERM_FLAG_CLASS, "spdisk", TERM_FLAG_EXEC, "gdu", "/", NULL }; +static const char *spdisk[] = { "d", TERM, TERM_FLAG_CLASS, "spdisk", TERM_FLAG_EXEC, "dua", "i", "/", NULL }; static const char *spvolm[] = { "v", TERM, TERM_FLAG_CLASS, "spvolm", TERM_FLAG_EXEC, "ncpamixer", NULL }; static const char *sphelp[] = { "h", TERM, TERM_FLAG_CLASS, "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, TERM_FLAG_CLASS, "spinet", TERM_FLAG_EXEC, "nmtui", NULL }; +static const char *spnetm[] = { "m", TERM, TERM_FLAG_CLASS, "spnetm", TERM_FLAG_EXEC, "nmtui", NULL }; +static const char *spnetu[] = { "u", TERM, TERM_FLAG_CLASS, "spnetu", TERM_FLAG_EXEC, "bandwhich", NULL }; static const char *spwiki[] = { "w", TERM, TERM_FLAG_CLASS, "spwiki", TERM_FLAG_EXEC, "zk", "edit", "-i", NULL }; static const char *spcalc[] = { "c", TERM, TERM_FLAG_CLASS, "spcalc", TERM_FLAG_EXEC, "bc", "-li", NULL }; @@ -153,8 +154,9 @@ static const Rule rules[] = { 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 = "spnetu", .scratchkey = 'u', .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") + RULE(.class = "spnetm", .scratchkey = 'm', .isfloating = 1, .floatpos = "100% 100% 800W 800H") }; static const BarRule barrules[] = { @@ -263,16 +265,16 @@ static const Key keys[] = { { MODKEY | ShiftMask, XK_c, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_r, setlayout, {.v = &layouts[4]} }, { MODKEY | ShiftMask, XK_r, setlayout, {.v = &layouts[5]} }, - { MODKEY, XK_l, focusdir, {.i = 1 } }, + { MODKEY, XK_l, focusdir, {.i = 1} }, { MODKEY | ShiftMask, XK_l, pushstack, {.i = INC(+1)} }, // { MODKEY, XK_slash, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_slash, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY, XK_equal, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_equal, spawn, {.v = (const char *[]){NULL}} }, - // { MODKEY, XK_a, spawn, {.v = (const char *[]){NULL}} }, + { MODKEY, XK_a, togglescratch, {.v = spdisk} }, // { MODKEY | ShiftMask, XK_a, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_o, togglescratch, {.v = spproc} }, - // { MODKEY | ShiftMask, XK_o, spawn, {.v = (const char *[]){NULL}} }, + { MODKEY | ShiftMask, XK_o, togglescratch, {.v = spnetu} }, { MODKEY, XK_e, togglescratch, {.v = spfile} }, // { MODKEY | ShiftMask, XK_e, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_u, spawn, {.v = (const char *[]){"dmenu_run", NULL}} }, @@ -306,7 +308,7 @@ static const Key keys[] = { { MODKEY | ShiftMask, XK_k, focusstack, {.i = INC(-1) } }, { MODKEY, XK_x, togglefloating, {0} }, { MODKEY | ShiftMask, XK_x, unfloatvisible, {0} }, - { MODKEY, XK_b, togglescratch, {.v = spinet} }, + { MODKEY, XK_b, togglescratch, {.v = spnetm} }, // { MODKEY | ShiftMask, XK_b, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_m, togglescratch, {.v = spvolm} }, { MODKEY | ShiftMask, XK_m, spawn, SHCMD("$HOME/.local/libexec/dwm/pamixer-notify -t") }, @@ -314,7 +316,7 @@ static const Key keys[] = { // { MODKEY | ShiftMask, XK_w, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_v, togglescratch, {.v = spcalc} }, // { MODKEY | ShiftMask, XK_v, spawn, {.v = (const char *[]){NULL}} }, - { MODKEY, XK_z, togglescratch, {.v = spdisk} }, + // { MODKEY, XK_z, spawn, {.v = (const char *[]){NULL}} }, TODO: Maybe oatmeal scratchpad? // { MODKEY | ShiftMask, XK_z, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_space, spawn, {.v = termcmd} }, { MODKEY | ShiftMask, XK_space, togglescratch, {.v = spterm} },