summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.def.h48
-rw-r--r--config.h48
-rw-r--r--patches/bold-is-not-bright.patch27
-rw-r--r--patches/gruvbox.patch70
4 files changed, 141 insertions, 52 deletions
diff --git a/config.def.h b/config.def.h
index 76c0e02..f12e606 100644
--- a/config.def.h
+++ b/config.def.h
@@ -5,7 +5,7 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char *font = "Fira Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Fira Code:pixelsize=12:antialias=true:autohint=true";
static int borderpx = 0;
static char *font2[] = {
@@ -103,37 +103,33 @@ unsigned int tabspaces = 8;
static const char *colorname[] = {
/* 8 normal colors */
- [0] = "#000000", /* black */
- [1] = "#ff5555", /* red */
- [2] = "#50fa7b", /* green */
- [3] = "#f1fa8c", /* yellow */
- [4] = "#bd93f9", /* blue */
- [5] = "#ff79c6", /* magenta */
- [6] = "#8be9fd", /* cyan */
- [7] = "#bbbbbb", /* white */
+ [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+ [1] = "#cc241d", /* red */
+ [2] = "#98971a", /* green */
+ [3] = "#d79921", /* yellow */
+ [4] = "#458588", /* blue */
+ [5] = "#b16286", /* magenta */
+ [6] = "#689d6a", /* cyan */
+ [7] = "#a89984", /* white */
/* 8 bright colors */
- [8] = "#44475a", /* black */
- [9] = "#ff5555", /* red */
- [10] = "#50fa7b", /* green */
- [11] = "#f1fa8c", /* yellow */
- [12] = "#bd93f9", /* blue */
- [13] = "#ff79c6", /* magenta */
- [14] = "#8be9fd", /* cyan */
- [15] = "#ffffff", /* white */
-
- /* special colors */
- [256] = "#282a36", /* background */
- [257] = "#f8f8f2", /* foreground */
+ [8] = "#928374", /* black */
+ [9] = "#fb4934", /* red */
+ [10] = "#b8bb26", /* green */
+ [11] = "#fabd2f", /* yellow */
+ [12] = "#83a598", /* blue */
+ [13] = "#d3869b", /* magenta */
+ [14] = "#8ec07c", /* cyan */
+ [15] = "#ebdbb2", /* white */
};
/*
* Default colors (colorname index)
* foreground, background, cursor
*/
-unsigned int defaultfg = 257;
-unsigned int defaultbg = 256;
-static unsigned int defaultcs = 257;
+unsigned int defaultfg = 15;
+unsigned int defaultbg = 0;
+static unsigned int defaultcs = 15;
static unsigned int defaultrcs = 257;
/*
@@ -215,8 +211,8 @@ static Shortcut shortcuts[] = {
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
- { TERMMOD, XK_K, kscrollup, {.i = 3} },
- { TERMMOD, XK_J, kscrolldown, {.i = 3} },
+ { TERMMOD, XK_K, kscrollup, {.i = 10} },
+ { TERMMOD, XK_J, kscrolldown, {.i = 10} },
};
/*
diff --git a/config.h b/config.h
index 76c0e02..f12e606 100644
--- a/config.h
+++ b/config.h
@@ -5,7 +5,7 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char *font = "Fira Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Fira Code:pixelsize=12:antialias=true:autohint=true";
static int borderpx = 0;
static char *font2[] = {
@@ -103,37 +103,33 @@ unsigned int tabspaces = 8;
static const char *colorname[] = {
/* 8 normal colors */
- [0] = "#000000", /* black */
- [1] = "#ff5555", /* red */
- [2] = "#50fa7b", /* green */
- [3] = "#f1fa8c", /* yellow */
- [4] = "#bd93f9", /* blue */
- [5] = "#ff79c6", /* magenta */
- [6] = "#8be9fd", /* cyan */
- [7] = "#bbbbbb", /* white */
+ [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+ [1] = "#cc241d", /* red */
+ [2] = "#98971a", /* green */
+ [3] = "#d79921", /* yellow */
+ [4] = "#458588", /* blue */
+ [5] = "#b16286", /* magenta */
+ [6] = "#689d6a", /* cyan */
+ [7] = "#a89984", /* white */
/* 8 bright colors */
- [8] = "#44475a", /* black */
- [9] = "#ff5555", /* red */
- [10] = "#50fa7b", /* green */
- [11] = "#f1fa8c", /* yellow */
- [12] = "#bd93f9", /* blue */
- [13] = "#ff79c6", /* magenta */
- [14] = "#8be9fd", /* cyan */
- [15] = "#ffffff", /* white */
-
- /* special colors */
- [256] = "#282a36", /* background */
- [257] = "#f8f8f2", /* foreground */
+ [8] = "#928374", /* black */
+ [9] = "#fb4934", /* red */
+ [10] = "#b8bb26", /* green */
+ [11] = "#fabd2f", /* yellow */
+ [12] = "#83a598", /* blue */
+ [13] = "#d3869b", /* magenta */
+ [14] = "#8ec07c", /* cyan */
+ [15] = "#ebdbb2", /* white */
};
/*
* Default colors (colorname index)
* foreground, background, cursor
*/
-unsigned int defaultfg = 257;
-unsigned int defaultbg = 256;
-static unsigned int defaultcs = 257;
+unsigned int defaultfg = 15;
+unsigned int defaultbg = 0;
+static unsigned int defaultcs = 15;
static unsigned int defaultrcs = 257;
/*
@@ -215,8 +211,8 @@ static Shortcut shortcuts[] = {
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
- { TERMMOD, XK_K, kscrollup, {.i = 3} },
- { TERMMOD, XK_J, kscrolldown, {.i = 3} },
+ { TERMMOD, XK_K, kscrollup, {.i = 10} },
+ { TERMMOD, XK_J, kscrolldown, {.i = 10} },
};
/*
diff --git a/patches/bold-is-not-bright.patch b/patches/bold-is-not-bright.patch
new file mode 100644
index 0000000..dd3e5bf
--- /dev/null
+++ b/patches/bold-is-not-bright.patch
@@ -0,0 +1,27 @@
+From e8f3c86d93613eef5af187dfd2dba9ae9919a2ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= <code@bnwr.net>
+Date: Sun, 27 Jan 2019 13:31:28 +0800
+Subject: [PATCH] Show bold not as bright
+
+---
+ x.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/x.c b/x.c
+index 0422421..904e1dc 100644
+--- a/x.c
++++ b/x.c
+@@ -1296,10 +1296,6 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ bg = &dc.col[base.bg];
+ }
+
+- /* Change basic system colors [0-7] to bright system colors [8-15] */
+- if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+- fg = &dc.col[base.fg + 8];
+-
+ if (IS_SET(MODE_REVERSE)) {
+ if (fg == &dc.col[defaultfg]) {
+ fg = &dc.col[defaultbg];
+--
+2.20.1
+
diff --git a/patches/gruvbox.patch b/patches/gruvbox.patch
new file mode 100644
index 0000000..c8390f0
--- /dev/null
+++ b/patches/gruvbox.patch
@@ -0,0 +1,70 @@
+diff --git a/config.def.h b/config.def.h
+index 877afab..6a1699f 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -84,41 +84,35 @@ static unsigned int tabspaces = 8;
+
+ /* Terminal colors (16 first used in escape sequence) */
+ 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",
+-};
+
++ /* 8 normal colors */
++ [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
++ [1] = "#cc241d", /* red */
++ [2] = "#98971a", /* green */
++ [3] = "#d79921", /* yellow */
++ [4] = "#458588", /* blue */
++ [5] = "#b16286", /* magenta */
++ [6] = "#689d6a", /* cyan */
++ [7] = "#a89984", /* white */
++
++ /* 8 bright colors */
++ [8] = "#928374", /* black */
++ [9] = "#fb4934", /* red */
++ [10] = "#b8bb26", /* green */
++ [11] = "#fabd2f", /* yellow */
++ [12] = "#83a598", /* blue */
++ [13] = "#d3869b", /* magenta */
++ [14] = "#8ec07c", /* cyan */
++ [15] = "#ebdbb2", /* white */
++};
+
+ /*
+ * Default colors (colorname index)
+- * foreground, background, cursor, reverse cursor
++ * foreground, background, cursor
+ */
+-unsigned int defaultfg = 7;
+-unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++unsigned int defaultfg = 15;
++unsigned int defaultbg = 0;
++static unsigned int defaultcs = 15;
+ static unsigned int defaultrcs = 257;
+
+ /*
generated by cgit (git 2.34.1) at 2026-05-16 01:58:57 +0000