instead of gruvbox, i will use gruvbox materila

This commit is contained in:
Ohio2 2021-07-29 21:34:23 +02:00
parent b2a1839cae
commit 78d14f4caf
5 changed files with 170 additions and 32 deletions

View file

@ -95,26 +95,25 @@ unsigned int tabspaces = 8;
/* Terminal colors (16 first used in escape sequence) */ /* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = { static const char *colorname[] = {
/* 8 normal colors */ /* 8 normal colors */
[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */ [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
[1] = "#cc241d", /* red */ [1] = "#ea6962", /* red */
[2] = "#98971a", /* green */ [2] = "#a9b665", /* green */
[3] = "#d79921", /* yellow */ [3] = "#d8a657", /* yellow */
[4] = "#458588", /* blue */ [4] = "#7daea3", /* blue */
[5] = "#b16286", /* magenta */ [5] = "#d3869b", /* magenta */
[6] = "#689d6a", /* cyan */ [6] = "#89b482", /* cyan */
[7] = "#a89984", /* white */ [7] = "#d4be98", /* white */
/* 8 bright colors */ /* 8 bright colors */
[8] = "#928374", /* black */ [8] = "#928374", /* black */
[9] = "#fb4934", /* red */ [9] = "#ef938e", /* red */
[10] = "#b8bb26", /* green */ [10] = "#bbc585", /* green */
[11] = "#fabd2f", /* yellow */ [11] = "#e1bb7e", /* yellow */
[12] = "#83a598", /* blue */ [12] = "#9dc2ba", /* blue */
[13] = "#d3869b", /* magenta */ [13] = "#e1acbb", /* magenta */
[14] = "#8ec07c", /* cyan */ [14] = "#a7c7a2", /* cyan */
[15] = "#ebdbb2", /* white */ [15] = "#e2d3ba", /* white */
}; };
/* /*
@ -133,7 +132,7 @@ static unsigned int defaultrcs = 257;
* 6: Bar ("|") * 6: Bar ("|")
* 7: Snowman ("") * 7: Snowman ("")
*/ */
static unsigned int cursorshape = 2; static unsigned int cursorshape = 6;
/* /*
* Default columns and rows numbers * Default columns and rows numbers

View file

@ -193,6 +193,7 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_Y, selpaste, {.i = 0} }, { TERMMOD, XK_Y, selpaste, {.i = 0} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
{ MODKEY, XK_l, copyurl, {.i = 0} },
}; };
/* /*

68
config.def.h.rej Normal file
View file

@ -0,0 +1,68 @@
--- config.def.h
+++ 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] = "#ea6962", /* red */
+ [2] = "#a9b665", /* green */
+ [3] = "#d8a657", /* yellow */
+ [4] = "#7daea3", /* blue */
+ [5] = "#d3869b", /* magenta */
+ [6] = "#89b482", /* cyan */
+ [7] = "#d4be98", /* white */
+
+ /* 8 bright colors */
+ [8] = "#928374", /* black */
+ [9] = "#ef938e", /* red */
+ [10] = "#bbc585", /* green */
+ [11] = "#e1bb7e", /* yellow */
+ [12] = "#9dc2ba", /* blue */
+ [13] = "#e1acbb", /* magenta */
+ [14] = "#a7c7a2", /* cyan */
+ [15] = "#e2d3ba", /* 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;
/*

View file

@ -95,28 +95,28 @@ unsigned int tabspaces = 8;
/* Terminal colors (16 first used in escape sequence) */ /* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = { static const char *colorname[] = {
/* 8 normal colors */ /* 8 normal colors */
[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */ [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
[1] = "#cc241d", /* red */ [1] = "#ea6962", /* red */
[2] = "#98971a", /* green */ [2] = "#a9b665", /* green */
[3] = "#d79921", /* yellow */ [3] = "#d8a657", /* yellow */
[4] = "#458588", /* blue */ [4] = "#7daea3", /* blue */
[5] = "#b16286", /* magenta */ [5] = "#d3869b", /* magenta */
[6] = "#689d6a", /* cyan */ [6] = "#89b482", /* cyan */
[7] = "#a89984", /* white */ [7] = "#d4be98", /* white */
/* 8 bright colors */ /* 8 bright colors */
[8] = "#928374", /* black */ [8] = "#928374", /* black */
[9] = "#fb4934", /* red */ [9] = "#ef938e", /* red */
[10] = "#b8bb26", /* green */ [10] = "#bbc585", /* green */
[11] = "#fabd2f", /* yellow */ [11] = "#e1bb7e", /* yellow */
[12] = "#83a598", /* blue */ [12] = "#9dc2ba", /* blue */
[13] = "#d3869b", /* magenta */ [13] = "#e1acbb", /* magenta */
[14] = "#8ec07c", /* cyan */ [14] = "#a7c7a2", /* cyan */
[15] = "#ebdbb2", /* white */ [15] = "#e2d3ba", /* white */
}; };
/* /*
* Default colors (colorname index) * Default colors (colorname index)
* foreground, background, cursor * foreground, background, cursor

View file

@ -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] = "#ea6962", /* red */
+ [2] = "#a9b665", /* green */
+ [3] = "#d8a657", /* yellow */
+ [4] = "#7daea3", /* blue */
+ [5] = "#d3869b", /* magenta */
+ [6] = "#89b482", /* cyan */
+ [7] = "#d4be98", /* white */
+
+ /* 8 bright colors */
+ [8] = "#928374", /* black */
+ [9] = "#ef938e", /* red */
+ [10] = "#bbc585", /* green */
+ [11] = "#e1bb7e", /* yellow */
+ [12] = "#9dc2ba", /* blue */
+ [13] = "#e1acbb", /* magenta */
+ [14] = "#a7c7a2", /* cyan */
+ [15] = "#e2d3ba", /* 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;
/*