From 90545ea5a1df0aafcccbd9ee9b3557bfc6a26083 Mon Sep 17 00:00:00 2001 From: mhsn Date: Thu, 10 Jul 2025 16:12:52 +0100 Subject: dwm: move key patches --- x11-wm/dwm/dwm-9999.ebuild | 4 +-- x11-wm/dwm/files/52_keys.diff | 51 +++++++++++++++++++++++++++++++++++ x11-wm/dwm/files/52_spawn-keys.diff | 20 -------------- x11-wm/dwm/files/53_volume-keys.diff | 32 ---------------------- x11-wm/dwm/files/90_general-keys.diff | 22 --------------- 5 files changed, 52 insertions(+), 77 deletions(-) create mode 100644 x11-wm/dwm/files/52_keys.diff delete mode 100644 x11-wm/dwm/files/52_spawn-keys.diff delete mode 100644 x11-wm/dwm/files/53_volume-keys.diff delete mode 100644 x11-wm/dwm/files/90_general-keys.diff diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild index 2c026d7..932a560 100644 --- a/x11-wm/dwm/dwm-9999.ebuild +++ b/x11-wm/dwm/dwm-9999.ebuild @@ -14,9 +14,7 @@ PATCHES=( "${FILESDIR}/01_centeredmaster.diff" "${FILESDIR}/50_larger-font.diff" "${FILESDIR}/51_colortheme.diff" - "${FILESDIR}/52_spawn-keys.diff" - "${FILESDIR}/53_volume-keys.diff" - "${FILESDIR}/90_general-keys.diff" + "${FILESDIR}/52_keys.diff" ) LICENSE="MIT" diff --git a/x11-wm/dwm/files/52_keys.diff b/x11-wm/dwm/files/52_keys.diff new file mode 100644 index 0000000..16e43df --- /dev/null +++ b/x11-wm/dwm/files/52_keys.diff @@ -0,0 +1,51 @@ +diff --git i/config.def.h w/config.def.h +index 4811f38..47920c9 100644 +--- i/config.def.h ++++ w/config.def.h +@@ -1,5 +1,7 @@ + /* See LICENSE file for copyright and license details. */ + ++#include ++ + /* appearance */ + static const unsigned int borderpx = 1; /* border pixel of windows */ + static const unsigned int snap = 32; /* snap pixel */ +@@ -60,14 +62,33 @@ static const Layout layouts[] = { + #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } + + /* 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_lilac, "-sf", col_gray4, NULL }; +-static const char *termcmd[] = { "st", NULL }; ++static char dmenumon[2] = "0"; /* component of dmenu_cmd, manipulated in spawn() */ ++static const char *dmenu_cmd[] = { "dmenu_run", "-m", dmenumon, NULL }; ++static const char *term_cmd[] = { "st", NULL }; ++static const char *browser_cmd[] = { "librewolf", NULL }; ++static const char *files_cmd[] = { "true", NULL }; /* WIP */ ++static const char *mail_cmd[] = { "st", "-e", "neomutt", NULL }; ++static const char *music_cmd[] = { "st", "-e", "rmpc", NULL }; ++static const char *mixer_cmd[] = { "st", "-e", "pulsemixer", NULL }; ++static const char *wlan_scan_cmd[] = { "iwctl", "wlp170s0", "scan", NULL }; ++ ++static const char *vol_up[] = { "wpctl", "set-volume", "@DEFAULT_SINK@", "5%+", NULL }; ++static const char *vol_down[] = { "wpctl", "set-volume", "@DEFAULT_SINK@", "5%-", NULL }; ++static const char *vol_mute[] = { "wpctl", "set-mute", "@DEFAULT_SINK@", "toggle", NULL }; + + static const Key keys[] = { + /* modifier key function argument */ +- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, +- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, ++ { MODKEY, XK_p, spawn, {.v = dmenu_cmd } }, ++ { MODKEY, XK_q, spawn, {.v = music_cmd } }, ++ { MODKEY|ShiftMask XK_q, spawn, {.v = mixer_cmd } }, ++ { MODKEY, XK_s, spawn, {.v = term_cmd } }, ++ { MODKEY, XK_w, spawn, {.v = browser_cmd } }, ++ { MODKEY|ShiftMask XK_w, spawn, {.v = wlan_scan_cmd } }, ++ { MODKEY, XK_e, spawn, {.v = files_cmd } }, ++ { MODKEY, XK_r, spawn, {.v = mail_cmd } }, ++ { 0, XF86XK_AudioRaiseVolume, spawn, { .v = vol_up } }, ++ { 0, XF86XK_AudioLowerVolume, spawn, { .v = vol_down } }, ++ { 0, XF86XK_AudioMute, spawn, { .v = vol_mute } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, diff --git a/x11-wm/dwm/files/52_spawn-keys.diff b/x11-wm/dwm/files/52_spawn-keys.diff deleted file mode 100644 index abbf987..0000000 --- a/x11-wm/dwm/files/52_spawn-keys.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git i/config.def.h w/config.def.h -index 4811f38..f1dfd43 100644 ---- i/config.def.h -+++ w/config.def.h -@@ -63,11 +63,15 @@ static const Layout layouts[] = { - 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_lilac, "-sf", col_gray4, NULL }; - static const char *termcmd[] = { "st", NULL }; -+static const char *browsercmd[] = { "librewolf", NULL }; -+static const char *mailcmd[] = { "claws-mail", NULL }; - - static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, -+ { MODKEY, XK_w, spawn, {.v = browsercmd } }, -+ { MODKEY, XK_r, spawn, {.v = mailcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, diff --git a/x11-wm/dwm/files/53_volume-keys.diff b/x11-wm/dwm/files/53_volume-keys.diff deleted file mode 100644 index 9503cd4..0000000 --- a/x11-wm/dwm/files/53_volume-keys.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git i/config.def.h w/config.def.h -index f1dfd43..e44a912 100644 ---- i/config.def.h -+++ w/config.def.h -@@ -1,5 +1,7 @@ - /* See LICENSE file for copyright and license details. */ - -+#include -+ - /* appearance */ - static const unsigned int borderpx = 1; /* border pixel of windows */ - static const unsigned int snap = 32; /* snap pixel */ -@@ -66,12 +68,19 @@ static const char *termcmd[] = { "st", NULL }; - static const char *browsercmd[] = { "librewolf", NULL }; - static const char *mailcmd[] = { "claws-mail", NULL }; - -+static const char *vol_up[] = { "wpctl", "set-volume", "@DEFAULT_SINK@", "5%+", NULL }; -+static const char *vol_down[] = { "wpctl", "set-volume", "@DEFAULT_SINK@", "5%-", NULL }; -+static const char *vol_mute[] = { "wpctl", "set-mute", "@DEFAULT_SINK@", "toggle", NULL }; -+ - static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_w, spawn, {.v = browsercmd } }, - { MODKEY, XK_r, spawn, {.v = mailcmd } }, -+ { 0, XF86XK_AudioRaiseVolume, spawn, { .v = vol_up } }, -+ { 0, XF86XK_AudioLowerVolume, spawn, { .v = vol_down } }, -+ { 0, XF86XK_AudioMute, spawn, { .v = vol_mute } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, diff --git a/x11-wm/dwm/files/90_general-keys.diff b/x11-wm/dwm/files/90_general-keys.diff deleted file mode 100644 index 56a78ef..0000000 --- a/x11-wm/dwm/files/90_general-keys.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git i/config.def.h w/config.def.h -index e44a912..c02d813 100644 ---- i/config.def.h -+++ w/config.def.h -@@ -75,7 +75,7 @@ static const char *vol_mute[] = { "pactl", "set-sink-mute", "@DEFAULT_SINK@", - static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, -- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, -+ { MODKEY, XK_s, spawn, {.v = termcmd } }, - { MODKEY, XK_w, spawn, {.v = browsercmd } }, - { MODKEY, XK_r, spawn, {.v = mailcmd } }, - { 0 XF86XK_AudioRaiseVolume, spawn, { .v = vol_up } }, -@@ -90,7 +90,7 @@ static const Key keys[] = { - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, -- { MODKEY|ShiftMask, XK_c, killclient, {0} }, -+ { MODKEY, XK_q, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, -- cgit v1.2.3