From e30f8b22069bec1a3fb68f089a9a7198671eb09a Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Wed, 17 Feb 2021 15:03:34 -0800 Subject: chore: update to configs before playing with ligature support in terminal --- include/libn/macro/map.h | 2 ++ sys/cmd/dwm/config.h | 2 +- sys/cmd/menu/config.h | 2 +- sys/cmd/term/config.h | 3 ++- sys/rules.mk | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/libn/macro/map.h b/include/libn/macro/map.h index 4724d1e..fae50ee 100644 --- a/include/libn/macro/map.h +++ b/include/libn/macro/map.h @@ -225,6 +225,8 @@ static const double __ac_HASH_UPPER = 0.77; } \ } +#define KEY_EXIST(m, x) (!__ac_iseither((m)->flags, (x))) + /* set macro */ #define SET_STRUCT_BODY(key_t) \ diff --git a/sys/cmd/dwm/config.h b/sys/cmd/dwm/config.h index 6866f80..27521b5 100644 --- a/sys/cmd/dwm/config.h +++ b/sys/cmd/dwm/config.h @@ -8,7 +8,7 @@ static uint snap = 32; /* snap pixel */ static int swallowfloating = 0; /* 1 will swallow floating by default */ static int showbar = 1; /* 0 means no bar */ static int topbar = 1; /* 0 means bottom bar */ -static char *fonts[] = { "consolas:size=14" }; +static char *fonts[] = { "consolas:size=12" }; static char col_gray1[] = "#323232"; static char col_gray2[] = "#444444"; static char col_gray3[] = "#bbbbbb"; diff --git a/sys/cmd/menu/config.h b/sys/cmd/menu/config.h index 090d465..1e14aa9 100644 --- a/sys/cmd/menu/config.h +++ b/sys/cmd/menu/config.h @@ -5,7 +5,7 @@ static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { - "consolas:size=14" + "consolas:size=12" }; static const char *prompt = "cmds"; /* -p option; prompt to the left of input field */ diff --git a/sys/cmd/term/config.h b/sys/cmd/term/config.h index 4cd1a09..1e4603a 100644 --- a/sys/cmd/term/config.h +++ b/sys/cmd/term/config.h @@ -6,7 +6,8 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "consolas:pixelsize=18:antialias=true"; +// static char *font = "consolas:pixelsize=16:antialias=true"; +static char *font = "FiraCode:pixelsize=16:antialias=true"; static int borderpx = 2; /* diff --git a/sys/rules.mk b/sys/rules.mk index a98e84c..669ea25 100644 --- a/sys/rules.mk +++ b/sys/rules.mk @@ -8,6 +8,9 @@ include share/push.mk DIR := $(d)/cmd include $(DIR)/rules.mk +# DIR := $(d)/haplotile +# include $(DIR)/rules.mk + DIR := $(d)/libn include $(DIR)/rules.mk -- cgit v1.2.1