updateHEADmaster

2 files changed, 29 insertions, 26 deletions

diff --git a/config.def.h b/config.def.h
index 2f31dd0..0e8e3e2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -7,8 +7,8 @@ static const unsigned int snap      = 32;       /* snap pixel */
 static const int swallowfloating    = 0;        /* 1 means swallow floating windows by default */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "Iosevka Nerd Font Regular:size=11","JoyPixels:size=11:antialias=true:autohint=true" };
-static const char dmenufont[]       = "Iosevka Nerd Font Mono:size=11";
+static const char *fonts[]          = {"Iosevka Nerd Font:style:medium:size=12"};
+static const char dmenufont[]       = "Iosevka:style:medium:size=12";
 static char normbgcolor[]           = "#222222";
 static char normbordercolor[]       = "#444444";
 static char normfgcolor[]           = "#bbbbbb";
@@ -29,15 +29,15 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class       instance  title          tags mask  iscentered  isfloating  isterminal  noswallow  monitor */
-	{ "Gimp",      NULL,     NULL,           0,         0,         1,          0,           0,        -1 },
-	{ "Librewolf", NULL,     NULL,           1 << 8,    0,         0,          0,           0,        -1 },
-	{ "Kitty",     NULL,     NULL,           0,         0,         0,          1,           0,        -1 },
-	{ "Orage",     NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
-	{ "St",        NULL,     NULL,           0,         1,         1,          1,           1,        -1 },
-	{ "Galculator", NULL,    NULL,           0,         1,         1,          0,           1,        -1 },
-	{ "Yad",       NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
-	{ NULL,        NULL,     "Event Tester", 0,         0,         0,          0,           1,        -1 }, /* xev */
+	/* class        instance  title          tags mask  iscentered  isfloating  isterminal  noswallow  monitor */
+	{ "Gimp",       NULL,     NULL,           0,         0,         1,          0,           0,        -1 },
+	{ "Librewolf",  NULL,     NULL,           1 << 8,    0,         0,          0,           0,        -1 },
+	{ "Ghostty",    NULL,     NULL,           0,         0,         0,          1,           0,        -1 },
+	{ "Orage",      NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
+	{ "St",         NULL,     NULL,           0,         1,         1,          1,           1,        -1 },
+	{ "Galculator", NULL,     NULL,           0,         1,         1,          0,           1,        -1 },
+	{ "Yad",        NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
+	{ NULL,         NULL,     "Event Tester", 0,         0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* layout(s) */
@@ -70,7 +70,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", selfgcolor, NULL };
-static const char *termcmd[]     = { "kitty", NULL };
+static const char *termcmd[]     = { "ghostty", NULL };
 static const char *webcmd[]      = { "librewolf", NULL };
 static const char *menupower[]   = { "dmenu-power", NULL };
 static const char *menuaudio[]   = { "dmenu-audio", NULL };
@@ -123,7 +123,8 @@ static const Key keys[] = {
 	{ 0,            XF86XK_MonBrightnessDown,  spawn,          SHCMD("brightnessctl set 10%-") },
 	{ 0,            XF86XK_MonBrightnessUp,    spawn,          SHCMD("brightnessctl set 10%+") },
 	{ 0,            XF86XK_Launch1,            spawn,          SHCMD("dmenu-power") },
-	{ 0,                            XK_Print,  spawn,          SHCMD("dwm-screenshot") },
+	{ 0,            XK_Print,                  spawn,          SHCMD("dwm-screenshot") },
+	{ 0,            XK_Scroll_Lock,            spawn,          SHCMD("dwm-scale") },
 	TAGKEYS(                        XK_ampersand,              0)
 	TAGKEYS(                        XK_eacute,                 1)
 	TAGKEYS(                        XK_quotedbl,               2)
diff --git a/config.h b/config.h
index 4136fe6..0e8e3e2 100644
--- a/config.h
+++ b/config.h
@@ -7,8 +7,8 @@ static const unsigned int snap      = 32;       /* snap pixel */
 static const int swallowfloating    = 0;        /* 1 means swallow floating windows by default */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "Iosevka Nerd Font Regular:size=11","JoyPixels:size=11:antialias=true:autohint=true" };
-static const char dmenufont[]       = "Iosevka Nerd Font Mono:size=11";
+static const char *fonts[]          = {"Iosevka Nerd Font:style:medium:size=12"};
+static const char dmenufont[]       = "Iosevka:style:medium:size=12";
 static char normbgcolor[]           = "#222222";
 static char normbordercolor[]       = "#444444";
 static char normfgcolor[]           = "#bbbbbb";
@@ -29,15 +29,15 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class       instance  title          tags mask  iscentered  isfloating  isterminal  noswallow  monitor */
-	{ "Gimp",      NULL,     NULL,           0,         0,         1,          0,           0,        -1 },
-	{ "Librewolf", NULL,     NULL,           1 << 8,    0,         0,          0,           0,        -1 },
-	{ "Kitty",     NULL,     NULL,           0,         0,         0,          1,           0,        -1 },
-	{ "Orage",     NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
-	{ "St",        NULL,     NULL,           0,         1,         1,          1,           1,        -1 },
-	{ "Galculator", NULL,    NULL,           0,         1,         1,          0,           1,        -1 },
-	{ "Yad",       NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
-	{ NULL,        NULL,     "Event Tester", 0,         0,         0,          0,           1,        -1 }, /* xev */
+	/* class        instance  title          tags mask  iscentered  isfloating  isterminal  noswallow  monitor */
+	{ "Gimp",       NULL,     NULL,           0,         0,         1,          0,           0,        -1 },
+	{ "Librewolf",  NULL,     NULL,           1 << 8,    0,         0,          0,           0,        -1 },
+	{ "Ghostty",    NULL,     NULL,           0,         0,         0,          1,           0,        -1 },
+	{ "Orage",      NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
+	{ "St",         NULL,     NULL,           0,         1,         1,          1,           1,        -1 },
+	{ "Galculator", NULL,     NULL,           0,         1,         1,          0,           1,        -1 },
+	{ "Yad",        NULL,     NULL,           0,         0,         1,          0,           1,        -1 },
+	{ NULL,         NULL,     "Event Tester", 0,         0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* layout(s) */
@@ -70,7 +70,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", selfgcolor, NULL };
-static const char *termcmd[]     = { "kitty", NULL };
+static const char *termcmd[]     = { "ghostty", NULL };
 static const char *webcmd[]      = { "librewolf", NULL };
 static const char *menupower[]   = { "dmenu-power", NULL };
 static const char *menuaudio[]   = { "dmenu-audio", NULL };
@@ -111,6 +111,7 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_Up,     rotatestack,    {.i = +1 } },
 	{ MODKEY|ShiftMask,             XK_Down,   rotatestack,    {.i = -1 } },
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
+	{ MODKEY|ControlMask|ShiftMask, XK_q,      quit,           {1} }, 
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY|ShiftMask,             XK_agrave, tag,            {.ui = ~0 } },
 	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
@@ -122,7 +123,8 @@ static const Key keys[] = {
 	{ 0,            XF86XK_MonBrightnessDown,  spawn,          SHCMD("brightnessctl set 10%-") },
 	{ 0,            XF86XK_MonBrightnessUp,    spawn,          SHCMD("brightnessctl set 10%+") },
 	{ 0,            XF86XK_Launch1,            spawn,          SHCMD("dmenu-power") },
-	{ 0,                            XK_Print,  spawn,          SHCMD("dwm-screenshot") },
+	{ 0,            XK_Print,                  spawn,          SHCMD("dwm-screenshot") },
+	{ 0,            XK_Scroll_Lock,            spawn,          SHCMD("dwm-scale") },
 	TAGKEYS(                        XK_ampersand,              0)
 	TAGKEYS(                        XK_eacute,                 1)
 	TAGKEYS(                        XK_quotedbl,               2)