move in local patches

6 files changed, 123 insertions, 0 deletions

diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 3ce0039..9862c83 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -18,6 +18,11 @@ fi
 
 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"
 )
 
 LICENSE="MIT"
diff --git a/x11-wm/dwm/files/50_larger-font.diff b/x11-wm/dwm/files/50_larger-font.diff
new file mode 100644
index 0000000..7aa314e
--- /dev/null
+++ b/x11-wm/dwm/files/50_larger-font.diff
@@ -0,0 +1,15 @@
+diff --git i/config.def.h w/config.def.h
+index aabe6c0..4503e5d 100644
+--- i/config.def.h
++++ w/config.def.h
+@@ -5,8 +5,8 @@ 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 dmenufont[]       = "monospace:size=10";
++static const char *fonts[]          = { "monospace:size=20" };
++static const char dmenufont[]       = "monospace:size=20";
+ static const char col_gray1[]       = "#222222";
+ static const char col_gray2[]       = "#444444";
+ static const char col_gray3[]       = "#bbbbbb";
diff --git a/x11-wm/dwm/files/51_colortheme.diff b/x11-wm/dwm/files/51_colortheme.diff
new file mode 100644
index 0000000..5d7ccba
--- /dev/null
+++ b/x11-wm/dwm/files/51_colortheme.diff
@@ -0,0 +1,29 @@
+diff --git i/config.def.h w/config.def.h
+index 4503e5d..4811f38 100644
+--- i/config.def.h
++++ w/config.def.h
+@@ -11,11 +11,13 @@ 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 col_lilac[]       = "#876bd6";
++static const char col_purple[]      = "#d12eb0";
++static const char col_green[]       = "#31cc43";
+ static const char *colors[][3]      = {
+ 	/*               fg         bg         border   */
+ 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+-	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
++	[SchemeSel]  = { col_gray4, col_lilac, col_lilac  },
+ };
+ 
+ /* tagging */
+@@ -59,7 +61,7 @@ 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", "-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 Key keys[] = {
diff --git a/x11-wm/dwm/files/52_spawn-keys.diff b/x11-wm/dwm/files/52_spawn-keys.diff
new file mode 100644
index 0000000..abbf987
--- /dev/null
+++ b/x11-wm/dwm/files/52_spawn-keys.diff
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..f1f67c7
--- /dev/null
+++ b/x11-wm/dwm/files/53_volume-keys.diff
@@ -0,0 +1,32 @@
+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 <X11/XF86keysym.h>
++
+ /* 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[]   = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%",    NULL };
++static const char *vol_down[] = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%",    NULL };
++static const char *vol_mute[] = { "pactl", "set-sink-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
new file mode 100644
index 0000000..443bf83
--- /dev/null
+++ b/x11-wm/dwm/files/90_general-keys.diff
@@ -0,0 +1,22 @@
+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_Return, 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]} },