dwm: colorscheme and fix patch

4 files changed, 29 insertions, 31 deletions

diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 932a560..87aa001 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://git.suckless.org/dwm"
 PATCHES=(
 	"${FILESDIR}/01_centeredmaster.diff"
 	"${FILESDIR}/50_larger-font.diff"
-	"${FILESDIR}/51_colortheme.diff"
+	"${FILESDIR}/51_colors.diff"
 	"${FILESDIR}/52_keys.diff"
 )
 
diff --git a/x11-wm/dwm/files/51_colors.diff b/x11-wm/dwm/files/51_colors.diff
new file mode 100644
index 0000000..04a1d44
--- /dev/null
+++ b/x11-wm/dwm/files/51_colors.diff
@@ -0,0 +1,27 @@
+diff --git i/config.def.h w/config.def.h
+index 4503e5d..19a0c61 100644
+--- i/config.def.h
++++ w/config.def.h
+@@ -7,15 +7,15 @@ static const int showbar            = 1;        /* 0 means no bar */
+ static const int topbar             = 1;        /* 0 means bottom bar */
+ 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";
+-static const char col_gray4[]       = "#eeeeee";
+-static const char col_cyan[]        = "#005577";
++static const char col_black[]       = "#152126";
++static const char col_white[]       = "#c0b1c2";
++static const char col_hblack[]      = "#5f5e66";
++static const char col_hwhite[]      = "#e1e1e6";
++static const char col_purple[]      = "#db498b";
+ static const char *colors[][3]      = {
+ 	/*               fg         bg         border   */
+-	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+-	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
++	[SchemeNorm] = { col_hblack, col_black,  col_black },
++	[SchemeSel]  = { col_hwhite, col_purple, col_purple },
+ };
+ 
+ /* tagging */
diff --git a/x11-wm/dwm/files/51_colortheme.diff b/x11-wm/dwm/files/51_colortheme.diff
deleted file mode 100644
index 5d7ccba..0000000
--- a/x11-wm/dwm/files/51_colortheme.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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_keys.diff b/x11-wm/dwm/files/52_keys.diff
index 16e43df..7b50b8a 100644
--- a/x11-wm/dwm/files/52_keys.diff
+++ b/x11-wm/dwm/files/52_keys.diff
@@ -15,7 +15,7 @@ index 4811f38..47920c9 100644
  
  /* 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 *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-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 };