diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index e13435a..5bea2c4 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -54,7 +54,6 @@ btop.enable = true; mpv.enable = true; dwm.enable = true; - vivado.enable = true; schizofox.enable = true; #git = { # enable = true; diff --git a/hosts/vali/mars/dwm/dwm-6.5/config.h b/hosts/vali/mars/dwm/dwm-6.5/config.h index 9acb871..647ebed 100644 --- a/hosts/vali/mars/dwm/dwm-6.5/config.h +++ b/hosts/vali/mars/dwm/dwm-6.5/config.h @@ -71,6 +71,10 @@ static const Key keys[] = { { MODKEY|ShiftMask, XK_i, incnmaster, {.i = -1 } }, { MODKEY, XK_h, 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, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_q, killclient, {0} }, @@ -81,10 +85,6 @@ static const Key keys[] = { { MODKEY, XK_space, togglefullscr, {0} }, { MODKEY, XK_0, view, {.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_2, 1) TAGKEYS( XK_3, 2) diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm b/hosts/vali/mars/dwm/dwm-6.5/dwm index 027a977..3952e1f 100755 Binary files a/hosts/vali/mars/dwm/dwm-6.5/dwm and b/hosts/vali/mars/dwm/dwm-6.5/dwm differ diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.o b/hosts/vali/mars/dwm/dwm-6.5/dwm.o index 4fb9219..e48aabb 100644 Binary files a/hosts/vali/mars/dwm/dwm-6.5/dwm.o and b/hosts/vali/mars/dwm/dwm-6.5/dwm.o differ diff --git a/hosts/vali/mars/profile.nix b/hosts/vali/mars/profile.nix index bc3a40a..3e6ec8a 100644 --- a/hosts/vali/mars/profile.nix +++ b/hosts/vali/mars/profile.nix @@ -9,5 +9,6 @@ _: { ../../../options/common/preserve-system.nix #../../options/ ../../../options/desktop/monitors.nix + ../../../overlay.nix ]; } diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 72d993f..ff880a6 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -10,8 +10,8 @@ _: { ./obs.nix ./foot.nix ./rofi.nix - ./vivado2.nix ./WM + ./vivado.nix ./alacritty.nix ./firefox.nix ./steam.nix