commit 8276dbb95cf29e508259a467bb3098f631540cfc
parent 3e4b8032d90211239026f15b46e2e68475cb70da
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Sat, 15 Dec 2018 13:11:49 +0100
Fix colors
Diffstat:
| M | Makefile | | | 6 | +++++- |
| M | config.h | | | 78 | ++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- |
2 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ default: st/st
st/st: st/config.h
@echo "Building st"
- make -C st
+ make -C st/
st/config.h: config.h st/
@echo "Copying custom configuration to source directory"
@@ -12,6 +12,10 @@ st/:
@echo "Fetching st source"
git clone git://git.suckless.org/st
+.PHONY: install
+install: st/st
+ sudo make -C st/ install
+
.PHONY: clean
clean:
$(RM) -r st/
diff --git a/config.h b/config.h
@@ -5,7 +5,7 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Pragmata Pro:pixelsize=14:antialias=true:autohint=true";
static int borderpx = 2;
/*
@@ -24,7 +24,7 @@ char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
char *vtiden = "\033[?6c";
/* Kerning / character bounding-box multipliers */
-static float cwscale = 1.0;
+static float cwscale = 0.8;
static float chscale = 1.0;
/*
@@ -82,33 +82,47 @@ char *termname = "st-256color";
*/
unsigned int tabspaces = 8;
-/* Terminal colors (16 first used in escape sequence) */
+/* bg opacity */
+//unsigned int alpha = 0xed;
+
static const char *colorname[] = {
- /* 8 normal colors */
- "black",
- "red3",
- "green3",
- "yellow3",
- "blue2",
- "magenta3",
- "cyan3",
- "gray90",
-
- /* 8 bright colors */
- "gray50",
- "red",
- "green",
- "yellow",
- "#5c5cff",
- "magenta",
- "cyan",
- "white",
-
- [255] = 0,
-
- /* more colors can be added after 255 to use with DefaultXX */
- "#cccccc",
- "#555555",
+ "#434944",
+ "#da5673",
+ "#8cc16d",
+ "#eebf35",
+ "#5cabdc",
+ "#b595cf",
+ "#44a9ba",
+ "#fbfbf8",
+ "#6c6d6b",
+ "#dba2b4",
+ "#898e38",
+ "#8a6b3d",
+ "#126b8c",
+ "#7457a2",
+ "#87c7d4",
+ "#bfc2bc",
+ // "#000000", /* hard contrast: #1d2021 / soft contrast: #32302f */
+ // "#cc241d",
+ // "#98971a",
+ // "#d79921",
+ // "#458588",
+ // "#b16286",
+ // "#689d6a",
+ // "#a89984",
+ // "#928374",
+ // "#fb4934",
+ // "#b8bb26",
+ // "#fabd2f",
+ // "#83a598",
+ // "#d3869b",
+ // "#8ec07c",
+ // "#ebdbb2",
+ // [255] = 0,
+ /* more colors can be added after 255 to use with DefaultXX */
+ [256] = "#000000", /* 256 -> bg */
+ [257] = "#FFFFFF", /* 257 -> fg */
+ //[258] = "#ff00ff" /* 258 -> cursorcolor */
};
@@ -116,10 +130,10 @@ static const char *colorname[] = {
* 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 = 15;
+unsigned int defaultbg = 256;
+static unsigned int defaultcs = 15;
+static unsigned int defaultrcs = 0;
/*
* Default shape of cursor
