diff --git a/config.def.h b/config.def.h index 88d2991..89cc70f 100644 --- a/config.def.h +++ b/config.def.h @@ -5,8 +5,8 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "mono:pixelsize=16:antialias=true:autohint=true"; -static char *font2[] = { "mono:pixelsize=16:antialias=true:autohint=true" }; +static char *font = "Iosevka Term:pixelsize=16:antialias=true:autohint=true"; +static char *font2[] = { "Iosevka Term:pixelsize=16:antialias=true:autohint=true" }; static int borderpx = 2; /* @@ -88,44 +88,33 @@ float alpha = 1; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - /* 8 normal colors */ - "#1f1f1f", /* hard contrast: #1d2021 / soft contrast: #32302f */ - "#f81118", - "#2dc55e", - "#ecba0f", - "#2a84d2", - "#4e5ab7", - "#1081d6", - "#d6dbe5", - "#d6dbe5", - "#de352e", - "#1dd361", - "#f3bd09", - "#1081d6", - "#5350b9", - "#0f7ddb", - "#ffffff", - [255] = 0, - /* more colors can be added after 255 to use with DefaultXX */ - "#282828", /* 256 -> bg */ - "#ebdbb2", /* 257 -> fg */ - "#add8e6", /* 258 -> cursor */ + /* 8 normal colors */ + "#161821", /* black */ + "#e27878", /* red */ + "#b4be82", /* green */ + "#e2a478", /* yellow */ + "#84a0c6", /* blue */ + "#a093c7", /* magenta */ + "#89b8c2", /* cyan */ + "#c6c8d1", /* white */ - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", + /* 8 bright colors */ + "#6b7089", /* black */ + "#e98989", /* red */ + "#c0ca8e", /* green */ + "#e9b189", /* yellow */ + "#91acd1", /* blue */ + "#ada0d3", /* magenta */ + "#95c4ce", /* cyan */ + "#d2d4de", /* white */ }; - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -unsigned int defaultfg = 257; -unsigned int defaultbg = 256; -static unsigned int defaultcs = 258; +unsigned int defaultfg = 7; +unsigned int defaultbg = 0; +static unsigned int defaultcs = 7; static unsigned int defaultrcs = 0; + /* * Default shape of cursor * 2: Block ("█") diff --git a/config.h b/config.h index a4563d2..89cc70f 100644 --- a/config.h +++ b/config.h @@ -5,8 +5,8 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "mono:pixelsize=16:antialias=true:autohint=true"; -static char *font2[] = { "mono:pixelsize=16:antialias=true:autohint=true" }; +static char *font = "Iosevka Term:pixelsize=16:antialias=true:autohint=true"; +static char *font2[] = { "Iosevka Term:pixelsize=16:antialias=true:autohint=true" }; static int borderpx = 2; /* @@ -88,44 +88,33 @@ float alpha = 1; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - /* 8 normal colors */ - "#1f1f1f", /* hard contrast: #1d2021 / soft contrast: #32302f */ - "#f81118", - "#2dc55e", - "#ecba0f", - "#2a84d2", - "#4e5ab7", - "#1081d6", - "#d6dbe5", - "#d6dbe5", - "#de352e", - "#1dd361", - "#f3bd09", - "#1081d6", - "#5350b9", - "#0f7ddb", - "#ffffff", - [255] = 0, - /* more colors can be added after 255 to use with DefaultXX */ - "#282828", /* 256 -> bg */ - "#ebdbb2", /* 257 -> fg */ - "#add8e6", /* 258 -> cursor */ + /* 8 normal colors */ + "#161821", /* black */ + "#e27878", /* red */ + "#b4be82", /* green */ + "#e2a478", /* yellow */ + "#84a0c6", /* blue */ + "#a093c7", /* magenta */ + "#89b8c2", /* cyan */ + "#c6c8d1", /* white */ - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", + /* 8 bright colors */ + "#6b7089", /* black */ + "#e98989", /* red */ + "#c0ca8e", /* green */ + "#e9b189", /* yellow */ + "#91acd1", /* blue */ + "#ada0d3", /* magenta */ + "#95c4ce", /* cyan */ + "#d2d4de", /* white */ }; - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -unsigned int defaultfg = 257; -unsigned int defaultbg = 256; -static unsigned int defaultcs = 258; +unsigned int defaultfg = 7; +unsigned int defaultbg = 0; +static unsigned int defaultcs = 7; static unsigned int defaultrcs = 0; + /* * Default shape of cursor * 2: Block ("█") @@ -167,31 +156,30 @@ static uint forcemousemod = ShiftMask; * Beware that overloading Button1 will disable the selection. */ static MouseShortcut mshortcuts[] = { - /* mask button function argument release */ - { Button4, XK_NO_MOD, "\031" }, - { Button5, XK_NO_MOD, "\005" }, - { XK_NO_MOD, Button4, kscrollup, {.i = 1} }, - { XK_NO_MOD, Button5, kscrolldown,{.i = 1} }, + /* mask button function argument release */ + { Button4, XK_NO_MOD, "\031" }, + { Button5, XK_NO_MOD, "\005" }, }; /* Internal keyboard shortcuts. */ #define MODKEY Mod1Mask +#define TERMMOD (ControlMask|ShiftMask) static Shortcut shortcuts[] = { /* mask keysym function argument */ - { MODKEY, XK_Break, sendbreak, {.i = 0} }, - { MODKEY, XK_Print, toggleprinter, {.i = 0} }, - { MODKEY, XK_Print, printscreen, {.i = 0} }, + { MODKEY, XK_Break, sendbreak, {.i = 0} }, + { MODKEY, XK_Print, toggleprinter, {.i = 0} }, + { MODKEY, XK_Print, printscreen, {.i = 0} }, { ShiftMask, XK_Insert, clippaste, {.i = 0} }, { MODKEY, XK_c, clipcopy, {.i = 0} }, { MODKEY, XK_v, clippaste, {.i = 0} }, { MODKEY, XK_p, selpaste, {.i = 0} }, { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, - { MODKEY, XK_k, kscrollup, {.i = 1} }, - { MODKEY, XK_j, kscrolldown, {.i = 1} }, - { MODKEY, XK_U, zoom, {.f = +1} }, - { MODKEY|ShiftMask, XK_U, zoom, {.f = +1} }, - { MODKEY|ShiftMask, XK_I, zoom, {.f = -1} }, + { MODKEY, XK_k, kscrollup, {.i = 1} }, + { MODKEY, XK_j, kscrolldown, {.i = 1} }, + { MODKEY, XK_U, zoom, {.f = +1} }, + { MODKEY|ShiftMask, XK_U, zoom, {.f = +1} }, + { MODKEY|ShiftMask, XK_I, zoom, {.f = -1} }, }; /*