fix(theme): consistent theme

8 files changed, 48 insertions, 50 deletions

diff --git a/sys/cmd/dwm/config.h b/sys/cmd/dwm/config.h
index d14aded..4af0de5 100644
--- a/sys/cmd/dwm/config.h
+++ b/sys/cmd/dwm/config.h
@@ -9,11 +9,11 @@ static int  swallowfloating   = 0;        /* 1 will swallow floating by default
 static int  showbar           = 1;        /* 0 means no bar */
 static int  topbar            = 1;        /* 0 means bottom bar */
 static char *fonts[]          = { "consolas:size=12" };
-static char col_gray1[]       = "#323232";
-static char col_gray2[]       = "#444444";
-static char col_gray3[]       = "#bbbbbb";
-static char col_gray4[]       = "#eeeeee";
-static char col_cyan[]        = "#24aed8";
+static char col_gray1[]       = "#504945";
+static char col_gray2[]       = "#282828";
+static char col_gray3[]       = "#fbf1c7";
+static char col_gray4[]       = "#504945";
+static char col_cyan[]        = "#83a598";
 static char *colors[][3]      = 
 {
 	/*               fg         bg         border   */
diff --git a/sys/cmd/dwm/dwm.c b/sys/cmd/dwm/dwm.c
index a432ab8..0567650 100644
--- a/sys/cmd/dwm/dwm.c
+++ b/sys/cmd/dwm/dwm.c
@@ -313,19 +313,19 @@ drawbar(Monitor *m)
 	Client *c;
 
 	/* draw status first so it can be overdrawn by tags later */
-	if (m == selmon) { /* status is only drawn on selected monitor */
+	if(m == selmon) { /* status is only drawn on selected monitor */
 		drw_setscheme(drw, scheme[SchemeNorm]);
 		tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
 		drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
 	}
 
-	for (c = m->clients; c; c = c->next) {
+	for(c = m->clients; c; c = c->next) {
 		occ |= c->tags;
 		if (c->isurgent)
 			urg |= c->tags;
 	}
 	x = 0;
-	for (i = 0; i < arrlen(tags); i++) {
+	for(i = 0; i < arrlen(tags); i++) {
 		w = TEXTW(tags[i]);
 		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
@@ -339,7 +339,7 @@ drawbar(Monitor *m)
 	drw_setscheme(drw, scheme[SchemeNorm]);
 	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
 
-	if ((w = m->ww - tw - x) > bh) {
+	if((w = m->ww - tw - x) > bh) {
 		if (m->sel) {
 			drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
 			drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
diff --git a/sys/cmd/dwm/util.c b/sys/cmd/dwm/util.c
index 46db60a..0db71cc 100644
--- a/sys/cmd/dwm/util.c
+++ b/sys/cmd/dwm/util.c
@@ -9,7 +9,7 @@ fatal(char *fmt, ...) {
     vfprintf(stderr, fmt, args);
     va_end(args);
 
-    if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+    if(fmt[0] && fmt[strlen(fmt)-1] == ':') {
         fputc(' ', stderr);
         perror(NULL);
     } else {
diff --git a/sys/cmd/menu/config.h b/sys/cmd/menu/config.h
index 1e14aa9..fb1614d 100644
--- a/sys/cmd/menu/config.h
+++ b/sys/cmd/menu/config.h
@@ -11,8 +11,8 @@ static const char *fonts[] = {
 static const char *prompt      = "cmds";      /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
 	             /*     fg         bg       */
-	[SchemeNorm] = { "#bbbbbb", "#323232" },
-	[SchemeSel]  = { "#eeeeee", "#24aed8" },
+	[SchemeNorm] = { "#fbf1c7", "#504945" },
+	[SchemeSel]  = { "#504945", "#83a598" },
 	[SchemeOut]  = { "#000000", "#00ffff" },
 };
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
diff --git a/sys/cmd/rules.mk b/sys/cmd/rules.mk
index dc0ca08..250b1ac 100644
--- a/sys/cmd/rules.mk
+++ b/sys/cmd/rules.mk
@@ -8,11 +8,14 @@ include share/push.mk
 DIR := $(d)/dwm
 include $(DIR)/rules.mk
 
-DIR := $(d)/tinywl
-include $(DIR)/rules.mk
+# DIR := $(d)/tinywl
+# include $(DIR)/rules.mk
 
-DIR := $(d)/wm
-include $(DIR)/rules.mk
+# DIR := $(d)/wm
+# include $(DIR)/rules.mk
+
+# DIR := $(d)/test
+# include $(DIR)/rules.mk
 
 DIR := $(d)/filter
 include $(DIR)/rules.mk
@@ -23,8 +26,8 @@ include $(DIR)/rules.mk
 DIR := $(d)/term
 include $(DIR)/rules.mk
 
-DIR := $(d)/term2
-include $(DIR)/rules.mk
+# DIR := $(d)/term2
+# include $(DIR)/rules.mk
 
 DIR := $(d)/walk
 include $(DIR)/rules.mk
diff --git a/sys/cmd/term/config.h b/sys/cmd/term/config.h
index f638e8a..40bc759 100644
--- a/sys/cmd/term/config.h
+++ b/sys/cmd/term/config.h
@@ -99,43 +99,40 @@ float alpha = 0.98;
 
 /* Terminal colors (16 first used in escape sequence) */
 static char *colorname[] = {
-	/* 8 normal colors */
-    "#4e4e4e",
-    "#d68787",
-    "#5f865f",
-    "#d8af5f",
-    "#85add4",
-    "#d7afaf",
-    "#87afaf",
-    "#d0d0d0",
-
-	/* 8 bright colors */
-    "#626262",
-    "#d75f87",
-    "#87af87",
-    "#ffd787",
-    "#add4fb",
-    "#ffafaf",
-    "#87d7d7",
-    "#e4e4e4",
+    "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+    "#ea6962", /* red     */
+    "#a9b665", /* green   */
+    "#d8a657", /* yellow  */
+    "#7daea3", /* blue    */
+    "#d3869b", /* magenta */
+    "#89b482", /* cyan    */
+    "#d4be98", /* white   */
+
+    "#928374", /* black   */
+    "#ef938e", /* red     */
+    "#bbc585", /* green   */
+    "#e1bb7e", /* yellow  */
+    "#9dc2ba", /* blue    */
+    "#e1acbb", /* magenta */
+    "#a7c7a2", /* cyan    */
+    "#e2d3ba", /* white   */
 
 	[255] = 0,
 
 	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-    "#3a3a3a",
+    "#fbf1c7",
+    "#3c3836",
+    "#555555",
 };
 
-
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-uint defaultfg         = 7;
-uint defaultbg         = 258;
-static uint defaultcs  = 256;
-static uint defaultrcs = 257;
+uint defaultfg         = 256;
+uint defaultbg         = 257;
+static uint defaultcs  = 15;
+static uint defaultrcs = 258;
 
 /*
  * Default shape of cursor
diff --git a/sys/cmd/term/rules.mk b/sys/cmd/term/rules.mk
index 19fcdaf..ef340b3 100644
--- a/sys/cmd/term/rules.mk
+++ b/sys/cmd/term/rules.mk
@@ -11,13 +11,12 @@ include share/paths.mk
 include share/dynamic.mk
 $(BINS_$(d)): TCFLAGS = \
 			`$(PKG) --cflags fontconfig` \
-			`$(PKG) --cflags freetype2` \
-			`$(PKG) --cflags harfbuzz`
+			`$(PKG) --cflags freetype2`
+
 $(BINS_$(d)): TCLIBS = \
 	`$(PKG) --libs fontconfig` \
     `$(PKG) --libs freetype2`  \
-	`$(PKG) --libs harfbuzz` \
-	-lm -lrt -lX11 -lutil -lXft -lXrender \
+	-lm -lrt -lX11 -lutil -lXft -lXrender -lharfbuzz
 
 $(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
 	$(COMPLINK)
diff --git a/sys/cmd/term/term.c b/sys/cmd/term/term.c
index 77ed5c2..6a73a8b 100644
--- a/sys/cmd/term/term.c
+++ b/sys/cmd/term/term.c
@@ -2107,7 +2107,6 @@ tputc(rune u)
         printf("%d + %d\n", gp->u, u);
 
         if(!hb_unicode_compose(hb_unicode_funcs_get_default(),gp->u, u, &nu)) {
-            assert(false);
             return;
         }