config.def.h

@@ -5,15 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-<<<<<<< HEAD
 static char *font = "mono:pixelsize=14:antialias=true:autohint=true";
-/* Spare fonts */
-static char *font2[] = {
-    /*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true",
-     */
-    /*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-};
-
 static int borderpx = 2;
 
 /*
@@ -133,6 +125,7 @@ static const char *colorname[] = {
 	"black",
 };
 
+
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
@@ -515,6 +508,7 @@ static uint selmasks[] = {
  * Printable characters in ASCII, used to estimate the advance width
  * of single wide characters.
  */
-static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
+static char ascii_printable[] =
+	" !\"#$%&'()*+,-./0123456789:;<=>?"
 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
 	"`abcdefghijklmnopqrstuvwxyz{|}~";

config.h

@@ -6,8 +6,7 @@
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
 static char *font =
-    "IosevkaTermSlab Nerd Font Propo:pixelsize=15:antialias=true:autohint=true";
+    "FiraCode Nerd Font Mono:pixelsize=13:antialias=true:autohint=true";
-static char *font2[] = {"Noto Color Emoji: pixelsize=12"};
 static int borderpx = 4;
 static int dark = 0;
 
@@ -97,26 +96,26 @@ char *termname = "st-256color";
 unsigned int tabspaces = 8;
 
 /* bg opacity */
-float alpha = 1.00;
+float alpha = 0.9;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-    "#191919",
+    "#1C1917",
     "#DE6E7C",
     "#819B69",
     "#B77E64",
     "#6099C0",
     "#B279A7",
     "#66A5AD",
-    "#BBBBBB",
+    "#B4BDC3",
-    "#3d3839",
+    "#403833",
     "#E8838F",
     "#8BAE68",
     "#D68C67",
     "#61ABDA",
     "#CF86C1",
     "#65B8C1",
-    "#8e8e8e",
+    "#888F94",
     [255] = 0,
 
     /* more colors can be added after 255 to use with DefaultXX */
@@ -193,6 +192,42 @@ static unsigned int defaultattr = 11;
  */
 static uint forcemousemod = ShiftMask;
 
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+    //		{ "font",         STRING,  &font },
+    //		{ "color0",       STRING,  &colorname[0] },
+    //		{ "color1",       STRING,  &colorname[1] },
+    //		{ "color2",       STRING,  &colorname[2] },
+    //		{ "color3",       STRING,  &colorname[3] },
+    //		{ "color4",       STRING,  &colorname[4] },
+    //		{ "color5",       STRING,  &colorname[5] },
+    //		{ "color6",       STRING,  &colorname[6] },
+    //		{ "color7",       STRING,  &colorname[7] },
+    //		{ "color8",       STRING,  &colorname[8] },
+    //		{ "color9",       STRING,  &colorname[9] },
+    //		{ "color10",      STRING,  &colorname[10] },
+    //		{ "color11",      STRING,  &colorname[11] },
+    //		{ "color12",      STRING,  &colorname[12] },
+    //		{ "color13",      STRING,  &colorname[13] },
+    //		{ "color14",      STRING,  &colorname[14] },
+    //		{ "color15",      STRING,  &colorname[15] },
+    //		{ "background",   STRING,  &colorname[256] },
+    //		{ "foreground",   STRING,  &colorname[257] },
+    //		{ "cursorColor",  STRING,  &colorname[258] },
+    //		{ "termname",     STRING,  &termname },
+    //		{ "shell",        STRING,  &shell },
+    //		{ "minlatency",   INTEGER, &minlatency },
+    //		{ "maxlatency",   INTEGER, &maxlatency },
+    //		{ "blinktimeout", INTEGER, &blinktimeout },
+    //		{ "bellvolume",   INTEGER, &bellvolume },
+    //		{ "tabspaces",    INTEGER, &tabspaces },
+    //		{ "borderpx",     INTEGER, &borderpx },
+    //		{ "cwscale",      FLOAT,   &cwscale },
+    //		{ "chscale",      FLOAT,   &chscale },
+};
+
 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.