merge issues

This commit is contained in:
Charlie Root 2024-04-20 23:32:26 +02:00
commit 75392fc24b
6 changed files with 6 additions and 6 deletions

View file

@ -54,7 +54,6 @@
btop.enable = true; btop.enable = true;
mpv.enable = true; mpv.enable = true;
dwm.enable = true; dwm.enable = true;
vivado.enable = true;
schizofox.enable = true; schizofox.enable = true;
#git = { #git = {
# enable = true; # enable = true;

View file

@ -71,6 +71,10 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_i, incnmaster, {.i = -1 } }, { MODKEY|ShiftMask, XK_i, incnmaster, {.i = -1 } },
{ 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|ShiftMask, XK_h, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_l, tagmon, {.i = -1 } },
{ MODKEY, XK_j, focusmon, {.i = -1 } },
{ MODKEY, XK_k, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_Return, zoom, {0} }, { MODKEY|ShiftMask, XK_Return, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_Tab, view, {0} },
{ MODKEY|ShiftMask, XK_q, killclient, {0} }, { MODKEY|ShiftMask, XK_q, killclient, {0} },
@ -81,10 +85,6 @@ static const Key keys[] = {
{ MODKEY, XK_space, togglefullscr, {0} }, { MODKEY, XK_space, 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_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, 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)

Binary file not shown.

Binary file not shown.

View file

@ -9,5 +9,6 @@ _: {
../../../options/common/preserve-system.nix ../../../options/common/preserve-system.nix
#../../options/ #../../options/
../../../options/desktop/monitors.nix ../../../options/desktop/monitors.nix
../../../overlay.nix
]; ];
} }

View file

@ -10,8 +10,8 @@ _: {
./obs.nix ./obs.nix
./foot.nix ./foot.nix
./rofi.nix ./rofi.nix
./vivado2.nix
./WM ./WM
./vivado.nix
./alacritty.nix ./alacritty.nix
./firefox.nix ./firefox.nix
./steam.nix ./steam.nix