FisionX/dwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Fernando 2023-08-16 11:07:48 -06:00
commit e4752b14fe
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
config.h
View File

@ -69,10 +69,10 @@ static const Layout layouts[] = {
/* key definitions */ /* key definitions */
#define MODKEY Mod1Mask #define MODKEY Mod1Mask
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
/* helper for spawning shell commands in the pre dwm-5.0 fashion */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
@ -90,7 +90,7 @@ static Key keys[] = {
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_e, spawn, SHCMD("setxkbmap us; kill -45 $(pidof dwmblocks)") }, { MODKEY, XK_e, spawn, SHCMD("setxkbmap us; kill -45 $(pidof dwmblocks)") },
{ MODKEY, XK_s, spawn, SHCMD("setxkbmap es; kill -45 $(pidof dwmblocks)") }, { MODKEY, XK_s, spawn, SHCMD("setxkbmap es; kill -45 $(pidof dwmblocks)") },
{ MODKEY|ShiftMask, XK_d, spawn, SHCMD("setxkbmap dvorak; kill -45 $(pidof dwmblocks)") }, { MODKEY|ShiftMask, XK_d, spawn, SHCMD("setxkbmap dvorak; kill -45 $(pidof dwmblocks)") },
/* { MODKEY, XK_w, spawn, SHCMD("$BROWSER") },*/ /* { MODKEY, XK_w, spawn, SHCMD("$BROWSER") },*/
{ MODKEY, XK_a, spawn, SHCMD("$flameshot gui") }, { MODKEY, XK_a, spawn, SHCMD("$flameshot gui") },
@ -102,10 +102,10 @@ static Key keys[] = {
{ MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_Return, zoom, {0} },
{ MODKEY, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") }, { 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|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, 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|ShiftMask, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") },
{ MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +3 } }, /* Increase gaps */ { MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +3 } }, /* Increase gaps */
{ MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -3 } }, /* Decrease gaps */ { MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -3 } }, /* Decrease gaps */
{ MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +3 } }, /* Increase inner gaps */ { MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +3 } }, /* Increase inner gaps */
@ -134,7 +134,7 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[11]} },/* centeredmaster */ { MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[11]} },/* centeredmaster */
{ MODKEY, XK_space, setlayout, {0} }, { MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, { MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } },
@ -142,15 +142,15 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2) TAGKEYS( XK_3, 2)
TAGKEYS( XK_4, 3) TAGKEYS( XK_4, 3)
TAGKEYS( XK_5, 4) TAGKEYS( XK_5, 4)
TAGKEYS( XK_6, 5) TAGKEYS( XK_6, 5)
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|ShiftMask, XK_q, quit, {0} }, { MODKEY|ShiftMask, XK_q, quit, {0} },
}; };
/* button definitions */ /* button definitions */