diff --git a/config.def.h b/config.def.h index c77b2a5..214631e 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 = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static char *font = "FiraCode Nerd Font Ret:size=10"; static int borderpx = 2; /* @@ -94,7 +94,7 @@ char *termname = "st-256color"; unsigned int tabspaces = 8; typedef struct { - const char* const colors[258]; /* terminal colors */ + const char* const colors[260]; /* terminal colors */ unsigned int fg; /* foreground */ unsigned int bg; /* background */ unsigned int cs; /* cursor */ @@ -106,61 +106,68 @@ typedef struct { * foreground, background, cursor, reverse cursor */ static const ColorScheme schemes[] = { - // st (dark) - {{"black", "red3", "green3", "yellow3", - "blue2", "magenta3", "cyan3", "gray90", - "gray50", "red", "green", "yellow", - "#5c5cff", "magenta", "cyan", "white", - [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, + // tokyonight-storm + {{"#1d202f", "#f7768e", "#9ece6a", "#e0af68", + "#7aa2f7", "#bb9af7", "#7dcfff", "#a9b1d6", + "#414868", "#f7768e", "#9ece6a", "#e0af68", + "#7aa2f7", "#bb9af7", "#7dcfff", "#c0caf5", + [256]="#81A1C1", "#555555", "#c0caf5", "#24283b"}, 258, 259, 256, 257}, - // Alacritty (dark) - {{"#1d1f21", "#cc6666", "#b5bd68", "#f0c674", - "#81a2be", "#b294bb", "#8abeb7", "#c5c8c6", - "#666666", "#d54e53", "#b9ca4a", "#e7c547", - "#7aa6da", "#c397d8", "#70c0b1", "#eaeaea", - [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, + // tokyonight-day + {{"#e9e9ed", "#f52a65", "#587539", "#8c6c3e", + "#2e7de9", "#9854f1", "#007197", "#6172b0", + "#a1a6c5", "#f52a65", "#587539", "#8c6c3e", + "#2e7de9", "#9854f1", "#007197", "#3760bf", + [256]="#3879C5", "#555555", "#3760bf", "#e1e2e7"}, 258, 259, 256, 257}, // One Half dark {{"#282c34", "#e06c75", "#98c379", "#e5c07b", "#61afef", "#c678dd", "#56b6c2", "#dcdfe4", "#282c34", "#e06c75", "#98c379", "#e5c07b", "#61afef", "#c678dd", "#56b6c2", "#dcdfe4", - [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, + [256]="#cccccc", "#555555", "black", "black"}, 7, 0, 256, 257}, // One Half light {{"#fafafa", "#e45649", "#50a14f", "#c18401", "#0184bc", "#a626a4", "#0997b3", "#383a42", "#fafafa", "#e45649", "#50a14f", "#c18401", "#0184bc", "#a626a4", "#0997b3", "#383a42", - [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, + [256]="#cccccc", "#555555", "black", "black"}, 7, 0, 256, 257}, // Solarized dark {{"#073642", "#dc322f", "#859900", "#b58900", "#268bd2", "#d33682", "#2aa198", "#eee8d5", "#002b36", "#cb4b16", "#586e75", "#657b83", "#839496", "#6c71c4", "#93a1a1", "#fdf6e3", - [256]="#93a1a1", "#fdf6e3"}, 12, 8, 256, 257}, + [256]="#93a1a1", "#fdf6e3", "black", "black"}, 12, 8, 256, 257}, // Solarized light {{"#eee8d5", "#dc322f", "#859900", "#b58900", "#268bd2", "#d33682", "#2aa198", "#073642", "#fdf6e3", "#cb4b16", "#93a1a1", "#839496", "#657b83", "#6c71c4", "#586e75", "#002b36", - [256]="#586e75", "#002b36"}, 12, 8, 256, 257}, + [256]="#586e75", "#002b36", "black", "black"}, 12, 8, 256, 257}, // Gruvbox dark {{"#282828", "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#a89984", "#928374", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2", - [256]="#ebdbb2", "#555555"}, 15, 0, 256, 257}, + [256]="#ebdbb2", "#555555", "black", "black"}, 15, 0, 256, 257}, // Gruvbox light {{"#fbf1c7", "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#7c6f64", "#928374", "#9d0006", "#79740e", "#b57614", "#076678", "#8f3f71", "#427b58", "#3c3836", - [256]="#3c3836", "#555555"}, 15, 0, 256, 257}, + [256]="#3c3836", "#555555", "black", "black"}, 15, 0, 256, 257}, + + // st (dark) + {{"black", "red3", "green3", "yellow3", + "blue2", "magenta3", "cyan3", "gray90", + "gray50", "red", "green", "yellow", + "#5c5cff", "magenta", "cyan", "white", + [256]="#cccccc", "#555555", "black", "black"}, 7, 0, 256, 257}, }; static const char * const * colorname; diff --git a/x.c b/x.c index d2d57be..8af36f0 100644 --- a/x.c +++ b/x.c @@ -806,7 +806,7 @@ xloadcols(void) for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp) XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); } else { - dc.collen = 258; + dc.collen = 260; dc.col = xmalloc(dc.collen * sizeof(Color)); }