diff --git a/hosts/vali/mars/dwm/dmenu-5.3/config.h b/hosts/vali/mars/dwm/dmenu-5.3/config.h new file mode 100644 index 0000000..687b07c --- /dev/null +++ b/hosts/vali/mars/dwm/dmenu-5.3/config.h @@ -0,0 +1,23 @@ +/* See LICENSE file for copyright and license details. */ +/* Default settings; can be overriden by command line. */ + +static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ +/* -fn option overrides fonts[0]; default X11 font or font set */ +static const char *fonts[] = { + "monospace:size=18" +}; +static const char *prompt = NULL; /* -p option; prompt to the left of input field */ +static const char *colors[SchemeLast][2] = { + /* fg bg */ + [SchemeNorm] = { "#bbbbbb", "#222222" }, + [SchemeSel] = { "#eeeeee", "#005577" }, + [SchemeOut] = { "#000000", "#00ffff" }, +}; +/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ +static unsigned int lines = 0; + +/* + * Characters not considered part of a word while deleting words + * for example: " /?\"&[]" + */ +static const char worddelimiters[] = " "; diff --git a/hosts/vali/mars/dwm/dmenu-5.3/dmenu b/hosts/vali/mars/dwm/dmenu-5.3/dmenu new file mode 100755 index 0000000..e47d646 Binary files /dev/null and b/hosts/vali/mars/dwm/dmenu-5.3/dmenu differ diff --git a/hosts/vali/mars/dwm/dmenu-5.3/dmenu.o b/hosts/vali/mars/dwm/dmenu-5.3/dmenu.o new file mode 100644 index 0000000..693870d Binary files /dev/null and b/hosts/vali/mars/dwm/dmenu-5.3/dmenu.o differ diff --git a/hosts/vali/mars/dwm/dmenu-5.3/drw.o b/hosts/vali/mars/dwm/dmenu-5.3/drw.o new file mode 100644 index 0000000..05bf8b6 Binary files /dev/null and b/hosts/vali/mars/dwm/dmenu-5.3/drw.o differ diff --git a/hosts/vali/mars/dwm/dmenu-5.3/shell.nix b/hosts/vali/mars/dwm/dmenu-5.3/shell.nix new file mode 100644 index 0000000..883e00e --- /dev/null +++ b/hosts/vali/mars/dwm/dmenu-5.3/shell.nix @@ -0,0 +1,9 @@ +{ pkgs ? import {} }: + pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + gnumake + xorg.libX11.dev + xorg.libXft + xorg.libXinerama + ]; +} diff --git a/hosts/vali/mars/dwm/dmenu-5.3/stest b/hosts/vali/mars/dwm/dmenu-5.3/stest new file mode 100755 index 0000000..fe45023 Binary files /dev/null and b/hosts/vali/mars/dwm/dmenu-5.3/stest differ diff --git a/hosts/vali/mars/dwm/dmenu-5.3/stest.o b/hosts/vali/mars/dwm/dmenu-5.3/stest.o new file mode 100644 index 0000000..27f2c5e Binary files /dev/null and b/hosts/vali/mars/dwm/dmenu-5.3/stest.o differ diff --git a/hosts/vali/mars/dwm/dmenu-5.3/util.o b/hosts/vali/mars/dwm/dmenu-5.3/util.o new file mode 100644 index 0000000..4b569ab Binary files /dev/null and b/hosts/vali/mars/dwm/dmenu-5.3/util.o differ diff --git a/hosts/vali/mars/dwm/dmenu.nix b/hosts/vali/mars/dwm/dmenu.nix deleted file mode 100644 index e69de29..0000000 diff --git a/hosts/vali/mars/dwm/dwm-6.5/config.h b/hosts/vali/mars/dwm/dwm-6.5/config.h index c6c72bc..3f512af 100644 --- a/hosts/vali/mars/dwm/dwm-6.5/config.h +++ b/hosts/vali/mars/dwm/dwm-6.5/config.h @@ -68,17 +68,17 @@ static const Key keys[] = { { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY|ShiftMask, XK_i, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - { MODKEY, XK_space, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_q, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_space, togglefullscr, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.1 b/hosts/vali/mars/dwm/dwm-6.5/dwm.1 index ddc8321..38531ea 100644 --- a/hosts/vali/mars/dwm/dwm-6.5/dwm.1 +++ b/hosts/vali/mars/dwm/dwm-6.5/dwm.1 @@ -117,6 +117,9 @@ Zooms/cycles focused window to/from master area (tiled layouts only). Close focused window. .TP .B Mod1\-Shift\-space +Toggle fullscreen for focused window. +.TP +.B Mod1\-Shift\-space Toggle focused window between tiled and floating state. .TP .B Mod1\-Tab diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.c b/hosts/vali/mars/dwm/dwm-6.5/dwm.c index f1d86b2..b801c2c 100644 --- a/hosts/vali/mars/dwm/dwm-6.5/dwm.c +++ b/hosts/vali/mars/dwm/dwm-6.5/dwm.c @@ -211,6 +211,7 @@ static void tagmon(const Arg *arg); static void tile(Monitor *m); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); +static void togglefullscr(const Arg *arg); static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); static void unfocus(Client *c, int setfocus); @@ -1735,6 +1736,13 @@ togglefloating(const Arg *arg) arrange(selmon); } +void +togglefullscr(const Arg *arg) +{ + if(selmon->sel) + setfullscreen(selmon->sel, !selmon->sel>isfullscreen); +} + void toggletag(const Arg *arg) { diff --git a/hosts/vali/mars/dwm/dwm.nix b/hosts/vali/mars/dwm/dwm.nix index a2104c0..a90b77c 100644 --- a/hosts/vali/mars/dwm/dwm.nix +++ b/hosts/vali/mars/dwm/dwm.nix @@ -16,11 +16,11 @@ in { nixpkgs.overlays = [ (final: prev: { dwm = prev.dwm.overrideAttrs (old: {src = ./dwm-6.5;}); - dmenu = prev.dmenu.overrideAttrs (old: {src = ./dmenu-5.3;}); }) ]; environment.systemPackages = with pkgs; [ (st.overrideAttrs (oldAttrs: rec { src = ./st-0.9.2; })) + (dmenu.overrideAttrs (oldAttrs: rec { src = ./dmenu-5.3; })) ]; }; diff --git a/hosts/vali/mars/dwm/st.nix b/hosts/vali/mars/dwm/st.nix deleted file mode 100644 index 2a15c65..0000000 --- a/hosts/vali/mars/dwm/st.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, lib, config, callPackage, ... }: -environment.systemPackages = with pkgs; [ - (st.overrideAttrs (oldAttrs: rec { src = ./st-0.9.2; })) -]; - diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index b91e21d..d51ff68 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -10,6 +10,7 @@ in { # betterbird bibata-cursors dig + dmenu easyeffects element-desktop eza