From 8b679a2e892310e461c3f5028dfaf60b25eea37f Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Fri, 8 Oct 2021 16:00:33 -0700
Subject: fix(theme): consistent theme

---
 sys/cmd/term/config.h | 51 ++++++++++++++++++++++++---------------------------
 sys/cmd/term/rules.mk |  7 +++----
 sys/cmd/term/term.c   |  1 -
 3 files changed, 27 insertions(+), 32 deletions(-)

(limited to 'sys/cmd/term')

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;
         }
 
-- 
cgit v1.2.1