Update font, xrdb colors & keybinds

2 files changed, 15 insertions, 14 deletions

diff --git a/config.h b/config.h
index 2c20323..cc4f0b9 100644
--- a/config.h
+++ b/config.h
@@ -25,8 +25,7 @@ enum showtab_modes { showtab_never, showtab_auto, showtab_nmodes, showtab_always
 static const int showtab      = showtab_auto; /* Default tab bar show mode */
 static const Bool toptab      = True;         /* False means bottom tab bar */
 
-static char font[]            = "JetBrainsMono Nerd Font:size=19:pixelsize=24";
-static char dmenufont[]       = "JetBrainsMono Nerd Font:size=19:pixelsize=24";
+static char font[]            = "JetBrainsMono Nerd Font:size=19:pixelsize=24:antialias=true:autohint=true";
 static const char *fonts[]    = { font, "Material Icons:size=24" };
 
 static char normbgcolor[]     = "#000000";
@@ -86,7 +85,7 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", normbgcolor, "-x", "10", "-y", "10", "-z", "2860", "-h", "44", NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", normbgcolor, "-x", "10", "-y", "10", "-z", "2860", "-h", "44", NULL };
 static const char *termcmd[]  = { "st", NULL };
 
 static const Key keys[] = {
@@ -126,22 +125,24 @@ static const Key keys[] = {
 	{ MODKEY,            XK_a,                     spawn,             SHCMD("passmenu") },
 	{ MODKEY,            XK_Escape,                spawn,             SHCMD("powermenu") },
 
-	{ MODKEY,            XK_p,                     spawn,             SHCMD("screenshot full") },
-	{ MODKEY|ShiftMask,  XK_p,                     spawn,             SHCMD("screenshot select") },
+	{ 0,                 XK_Print,                 spawn,             SHCMD("screenshot full") },
+	{ ShiftMask,         XK_Print,                 spawn,             SHCMD("screenshot select") },
 
 	{ 0,                 XF86XK_MonBrightnessUp,   spawn,             SHCMD("brightness smallup monitor") },
 	{ ShiftMask,         XF86XK_MonBrightnessUp,   spawn,             SHCMD("brightness up monitor") },
-	{ MODKEY,            XF86XK_MonBrightnessUp,   spawn,             SHCMD("redshift -P -O 3500") },
 	{ 0,                 XF86XK_MonBrightnessDown, spawn,             SHCMD("brightness smalldown monitor") },
 	{ ShiftMask,         XF86XK_MonBrightnessDown, spawn,             SHCMD("brightness down monitor") },
+
+	{ MODKEY,            XF86XK_MonBrightnessUp,   spawn,             SHCMD("redshift -P -O 3500") },
 	{ MODKEY,            XF86XK_MonBrightnessDown, spawn,             SHCMD("redshift -x") },
 
 	{ 0,                 XF86XK_KbdBrightnessUp,   spawn,             SHCMD("brightness smallup keyboard") },
 	{ ShiftMask,         XF86XK_KbdBrightnessUp,   spawn,             SHCMD("brightness up keyboard") },
-	{ MODKEY,            XF86XK_KbdBrightnessUp,   spawn,             SHCMD("wifi on") },
 	{ 0,                 XF86XK_KbdBrightnessDown, spawn,             SHCMD("brightness smalldown keyboard") },
 	{ ShiftMask,         XF86XK_KbdBrightnessDown, spawn,             SHCMD("brightness down keyboard") },
-	{ MODKEY,            XF86XK_KbdBrightnessDown, spawn,             SHCMD("wifi off") },
+
+	{ MODKEY,            XF86XK_KbdBrightnessUp,   spawn,             SHCMD("wifi off") },
+	{ MODKEY,            XF86XK_KbdBrightnessDown, spawn,             SHCMD("wifi on") },
 
 	{ 0,                 XF86XK_AudioPrev,         spawn,             SHCMD("musctl previous") },
 	{ 0,                 XF86XK_AudioNext,         spawn,             SHCMD("musctl next") },
diff --git a/dwm.c b/dwm.c
index 18d0341..0ec7529 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1491,12 +1491,12 @@ loadxrdb()
       xrdb = XrmGetStringDatabase(resm);
 
       if (xrdb != NULL) {
-        XRDB_LOAD_COLOR("dwm.normbordercolor", normbordercolor);
-        XRDB_LOAD_COLOR("dwm.normbgcolor", normbgcolor);
-        XRDB_LOAD_COLOR("dwm.normfgcolor", normfgcolor);
-        XRDB_LOAD_COLOR("dwm.selbordercolor", selbordercolor);
-        XRDB_LOAD_COLOR("dwm.selbgcolor", selbgcolor);
-        XRDB_LOAD_COLOR("dwm.selfgcolor", selfgcolor);
+        XRDB_LOAD_COLOR("dwm.color9", normbordercolor);
+        XRDB_LOAD_COLOR("dwm.color0", normbgcolor);
+        XRDB_LOAD_COLOR("dwm.color15", normfgcolor);
+        XRDB_LOAD_COLOR("dwm.color1", selbordercolor);
+        XRDB_LOAD_COLOR("dwm.color1", selbgcolor);
+        XRDB_LOAD_COLOR("dwm.color0", selfgcolor);
       }
     }
   }