From 5a38a89afdde61c955d571fa87039a40b224a429 Mon Sep 17 00:00:00 2001 From: riomoo Date: Sun, 26 Jan 2025 14:50:48 -0500 Subject: [PATCH 1/4] Sourced DWM --- config.def.h | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/config.def.h b/config.def.h index 9efa774..0e028de 100644 --- a/config.def.h +++ b/config.def.h @@ -6,17 +6,8 @@ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "monospace:size=10" }; -static const char dmenufont[] = "monospace:size=10"; -static const char col_gray1[] = "#222222"; -static const char col_gray2[] = "#444444"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, -}; + +#include "/home/moo/.config/themes/using/colors-wal-dwm.h" /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -45,7 +36,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -57,13 +48,13 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-p", "Run: ", NULL }; static const char *termcmd[] = { "st", NULL }; static const Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -71,7 +62,7 @@ static const Key keys[] = { { MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, XK_p, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, From 162f3c32f2a4453a2f28a75bd583e287c8b25032 Mon Sep 17 00:00:00 2001 From: riomoo Date: Sun, 26 Jan 2025 23:56:56 -0500 Subject: [PATCH 2/4] My version of DWM --- Makefile | 2 +- config.def.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ffa69b4..d2cca80 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ dwm: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} clean: - rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz + rm -f dwm ${OBJ} config.h dwm-${VERSION}.tar.gz dist: clean mkdir -p dwm-${VERSION} diff --git a/config.def.h b/config.def.h index 0e028de..b73b0fc 100644 --- a/config.def.h +++ b/config.def.h @@ -5,7 +5,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=10" }; +static const char *fonts[] = { "monospace:size=16" }; #include "/home/moo/.config/themes/using/colors-wal-dwm.h" @@ -18,8 +18,10 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + { "Gimp", NULL, NULL, 4, 0, -1 }, + { "Waterfox", NULL, NULL, 1, 0, -1 }, + { "Element", NULL, NULL, 8, 0, -1 }, + { "Discord", NULL, NULL, 8, 0, -1 }, }; /* layout(s) */ From 5eb2db40610d2eca31b34e30834324285bb7d816 Mon Sep 17 00:00:00 2001 From: riomoo Date: Mon, 27 Jan 2025 05:48:41 -0500 Subject: [PATCH 3/4] Quality of Life --- config.def.h | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/config.def.h b/config.def.h index b73b0fc..7f466e5 100644 --- a/config.def.h +++ b/config.def.h @@ -5,23 +5,33 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=16" }; +/*static const char *fonts[] = { "monospace:size=16" }; + */ +static const char *fonts[] = {"Mononoki Nerd Font:size=16:antialias=true:autohint=true", + "Hack:size=14:antialias=true:autohint=true", + "JoyPixels:size=16:antialias=true:autohint=true"}; #include "/home/moo/.config/themes/using/colors-wal-dwm.h" /* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +/*static const char *tags[] = { "", "", "", "", "", "", "7", "8", "9" }; + */ +static const char *tags[] = { "•", "•", "•", "•", "•", "•", "•", "•", "•" }; static const Rule rules[] = { /* xprop(1): * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title */ - /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 4, 0, -1 }, - { "Waterfox", NULL, NULL, 1, 0, -1 }, - { "Element", NULL, NULL, 8, 0, -1 }, - { "Discord", NULL, NULL, 8, 0, -1 }, + /* class instance title tags mask isfloating monitor */ + { "Gimp", NULL, NULL, 1 << 6, 0, -1 }, + { NULL, NULL, "pulsemixer", 0, 1, -1 }, + { "waterfox", NULL, NULL, 1, 0, -1 }, + { "Element", NULL, NULL, 1 << 8, 0, -1 }, + { NULL, NULL, "LibreWolf", 1 << 0, 0, -1 }, + { NULL, NULL, "Waterfox", 1 << 0, 0, -1 }, + { NULL, NULL, "Discord", 1 << 8, 0, -1 }, + { "mpv", NULL, NULL, 1 << 5, 1, -1 }, }; /* layout(s) */ @@ -52,11 +62,13 @@ static const Layout layouts[] = { static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-p", "Run: ", NULL }; static const char *termcmd[] = { "st", NULL }; +static const char *volume[] = { "st", "-e", "pulsemixer", NULL }; static const Key keys[] = { /* modifier key function argument */ - { MODKEY|ShiftMask, XK_Return, spawn, {.v = dmenucmd } }, { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = dmenucmd } }, + { MODKEY|Mod1Mask, XK_v, spawn, {.v = volume } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, From 6e9eaf61ac9154bf561ed9f788978fe841e10012 Mon Sep 17 00:00:00 2001 From: riomoo Date: Mon, 27 Jan 2025 06:25:23 -0500 Subject: [PATCH 4/4] better stuff --- config.def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.def.h b/config.def.h index 7f466e5..26c446d 100644 --- a/config.def.h +++ b/config.def.h @@ -1,7 +1,7 @@ /* See LICENSE file for copyright and license details. */ /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 3; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */