diff --git a/Xresources b/Xresources index 82bdfcb..0e04d36 100644 --- a/Xresources +++ b/Xresources @@ -3,7 +3,7 @@ cursor.size: 24 xterm*Background: black xterm*Foreground: white xterm*faceName: JetBrainsMono Nerd Font Mono -xterm*faceSize: 14 +xterm*faceSize: 11 dwm.normbordercolor: #444444 dwm.normbgcolor: #222222 diff --git a/dwm/config.h b/dwm/config.h index c1a110c..55e153c 100644 --- a/dwm/config.h +++ b/dwm/config.h @@ -62,7 +62,7 @@ static const Layout layouts[] = { static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-l", "10", "-x", "400", "-y", "300", "-z", "500", NULL }; static const char *powermenucmd[] = { "dmenu-powermenu", NULL }; -static const char *termcmd[] = { "alacritty", NULL }; +static const char *termcmd[] = { "xterm", NULL }; static const Key keys[] = { /* modifier key function argument */ diff --git a/gitconfig b/gitconfig index f5d329b..33813a5 100644 --- a/gitconfig +++ b/gitconfig @@ -13,3 +13,12 @@ s = status ps = push pl = pull +[core] + pager = delta +[interactive] + diffFilter = delta --color-only +[delta] + nevigate = true + dark = true +[merge] + conflictstyle = zdiff3