From a1e3655fcb03dd6a2d8488bab97271fe9d6cbff5 Mon Sep 17 00:00:00 2001
From: Armaan Bhojwani <me@armaanb.net>
Date: Mon, 28 Jun 2021 10:59:26 -0400
Subject: [PATCH] Remove config.def.h

---
 .gitignore               |  3 +-
 Makefile                 | 11 +++----
 config.def.h => config.h | 62 ++++++++++++++++++++++++++--------------
 3 files changed, 46 insertions(+), 30 deletions(-)
 rename config.def.h => config.h (95%)

diff --git a/.gitignore b/.gitignore
index c36375a..0c2922c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 *.o
-st
-config.h
\ No newline at end of file
+st
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 38240da..b6e7e33 100644
--- a/Makefile
+++ b/Makefile
@@ -15,17 +15,14 @@ options:
 	@echo "LDFLAGS = $(STLDFLAGS)"
 	@echo "CC      = $(CC)"
 
-config.h:
-	cp config.def.h config.h
-
 .c.o:
 	$(CC) $(STCFLAGS) -c $<
 
-st.o: config.h st.h win.h
-x.o: arg.h config.h st.h win.h hb.h
+st.o: st.h win.h
+x.o: arg.h st.h win.h hb.h
 hb.o: st.h
 
-$(OBJ): config.h config.mk
+$(OBJ): config.mk
 
 st: $(OBJ)
 	$(CC) -o $@ $(OBJ) $(STLDFLAGS)
@@ -36,7 +33,7 @@ clean:
 dist: clean
 	mkdir -p st-$(VERSION)
 	cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
-		config.def.h st.info st.1 arg.h st.h win.h $(SRC)\
+		st.info st.1 arg.h st.h win.h $(SRC)\
 		st-$(VERSION)
 	tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
 	rm -rf st-$(VERSION)
diff --git a/config.def.h b/config.h
similarity index 95%
rename from config.def.h
rename to config.h
index bee5b12..dc179d7 100644
--- a/config.def.h
+++ b/config.h
@@ -95,43 +95,63 @@ unsigned int tabspaces = 8;
 
 /* Terminal colors (16 first used in escape sequence).
 	 Modus Operandi theme. */
+/* static const char *colorname[] = { */
+/* 	/\* 8 normal colors *\/ */
+/* 	"#000000", // black */
+/* 	"#ff8059", // red */
+/* 	"#00fc50", // green */
+/* 	"#eecc00", // yellow */
+/* 	"#29aeff", // blue */
+/* 	"#feacd0", // magenta */
+/* 	"#00d3d0", // cyan */
+/* 	"#ffffff", // white */
+
+/* 	/\* 8 bright colors *\/ */
+/* 	"#555555", // black */
+/* 	"#ffa0a0", // red */
+/* 	"#88cf88", // green */
+/* 	"#d2b580", // yellow */
+/* 	"#92baff", // blue */
+/* 	"#e0b2d6", // magenta */
+/* 	"#a0bfdf", // cyan */
+/* 	"#ffffff", // white */
+
+/* 	[255] = 0, */
+/* }; */
+
+// Modus operandi theme
 static const char *colorname[] = {
 	/* 8 normal colors */
 	"#000000", // black
-	"#ff8059", // red
-	"#00fc50", // green
-	"#eecc00", // yellow
-	"#29aeff", // blue
-	"#feacd0", // magenta
-	"#00d3d0", // cyan
+	"#a60000", // red
+	"#005e00", // green
+	"#813e00", // yellow
+	"#0031a9", // blue
+	"#721045", // magenta
+	"#00538b", // cyan
 	"#ffffff", // white
 
 	/* 8 bright colors */
 	"#555555", // black
-	"#ffa0a0", // red
-	"#88cf88", // green
-	"#d2b580", // yellow
-	"#92baff", // blue
-	"#e0b2d6", // magenta
-	"#a0bfdf", // cyan
+	"#b60000", // red
+	"#006800", // green
+	"#605b00", // yellow
+	"#b5d0ff", // blue
+	"#a8007f", // magenta
+	"#005f88", // cyan
 	"#ffffff", // white
 
 	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
 };
 
-
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 7;
-unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
+unsigned int defaultfg = 0;
+unsigned int defaultbg = 7;
+static unsigned int defaultcs = 0;
+static unsigned int defaultrcs = 7;
 
 /*
  * Default shape of cursor
-- 
2.39.2