fix: bar height patch and customisations

- Apply the bar height patch
- Update font
- Change the tag icons
- Change the master area size factor from 0.55 to 0.50

README.md

@@ -74,3 +74,4 @@ The `MODKEY` is set to the Super key (Windows key).
 | `MODKEY + SHIFT + q`      | quit dwm                                |
 | `MODKEY + SHIFT + <N>`    | move the active window to workspace <N> |
 | `MODKEY + <N>`            | move to workspace <N>                   |
+| `MODKEY + p`              | run dmenu                              |

config.h

@@ -5,16 +5,16 @@
 
 /* appearance */
 static const char *fonts[] = {
-  "Noto Sans:size=10",
-  "monospace:size=10"
+  "Ubuntu Nerd Font:size=10",
+  "Noto Sans:size=10"
 };
 
 static const char dmenufont[]       = "monospace:size=10";
 static const unsigned int borderpx  = 2;            /* border pixel of windows */
-//static const unsigned int gappx     = 2;            /* useless gap patch: gaps between windows */
 static const unsigned int snap      = 32;           /* snap pixel */
 static const int showbar            = 1;            /* 0 means no bar */
 static const int topbar             = 1;            /* 0 means bottom bar */
+static const int user_bh            = 30;           /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */
 static const char col_gray1[]       = "#15161e";    /* Currently used as the background colour */
 static const char col_gray2[]       = "#444444";    /* Inactive window border colour */
 static const char col_gray3[]       = "#bbbbbb";    /* Font colour */
@@ -28,7 +28,7 @@ static const char *colors[][3]      = {
 };
 
 /* tagging */
-static const char *tags[] = { "", "", "", "" };
+static const char *tags[] = { "", "", "", "" };
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -36,12 +36,11 @@ static const Rule rules[] = {
 	 *	WM_NAME(STRING) = title
 	 */
 	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 3,       0,           -1 },
+	{ "firefox",  NULL,       NULL,       1 << 1,       0,           -1 } /* Open Firefox in tag 2 */
 };
 
 /* layout(s) */
-static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
+static const float mfact     = 0.50; /* factor of master area size [0.05..0.95] */
 static const int nmaster     = 1;    /* number of clients in master area */
 static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
 static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
@@ -70,11 +69,12 @@ static const char *dmenucmd[]   = { "dmenu_run", "-m", dmenumon, "-fn", dmenufon
 static const char *termcmd[]    = { TERMINAL, NULL };
 static const char *tmuxcmd[]    = { TERMINAL, "-e", "tmux", NULL };
 static const char *firefoxcmd[] = { "firefox", NULL };
+static const char *logoutcmd[]  = { "pkill", "dwm", NULL };
 
 static Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = tmuxcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
@@ -100,8 +100,9 @@ static Key keys[] = {
 	TAGKEYS(                        XK_2,                      1)
 	TAGKEYS(                        XK_3,                      2)
 	TAGKEYS(                        XK_4,                      3)
-	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-  { MODKEY|ShiftMask,             XK_t,      spawn,          {.v = tmuxcmd } },
+	{ MODKEY|ShiftMask,             XK_r,      quit,           {0} },                  /* This actually restarts DWM */
+	{ MODKEY|ShiftMask,             XK_q,      spawn,          {.v = logoutcmd } },    /* This returns you to the login manager */
+  { MODKEY|ShiftMask,             XK_t,      spawn,          {.v = termcmd } },
   { MODKEY|ShiftMask,             XK_b,      spawn,          {.v = firefoxcmd } },
 };
 

config.mk

@@ -4,7 +4,7 @@ VERSION = 6.3
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
+PREFIX = ${HOME}/.local
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include

dwm.c

@@ -1549,7 +1549,7 @@ setup(void)
 	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
 		die("no fonts could be loaded.");
 	lrpad = drw->fonts->h;
-	bh = drw->fonts->h + 2;
+	bh = user_bh ? user_bh : drw->fonts->h + 2;
 	updategeom();
 	/* init atoms */
 	utf8string = XInternAtom(dpy, "UTF8_STRING", False);

patches/dwm-bar-height-6.2.diff

@@ -0,0 +1,25 @@
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..9814500 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -5,6 +5,7 @@ static const unsigned int borderpx  = 1;        /* border pixel of windows */
+ static const unsigned int snap      = 32;       /* snap pixel */
+ static const int showbar            = 1;        /* 0 means no bar */
+ static const int topbar             = 1;        /* 0 means bottom bar */
++static const int user_bh            = 0;        /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */
+ static const char *fonts[]          = { "monospace:size=10" };
+ static const char dmenufont[]       = "monospace:size=10";
+ static const char col_gray1[]       = "#222222";
+diff --git a/dwm.c b/dwm.c
+index 4465af1..2c27cb3 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -1545,7 +1545,7 @@ setup(void)
+ 	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+ 		die("no fonts could be loaded.");
+ 	lrpad = drw->fonts->h;
+-	bh = drw->fonts->h + 2;
++	bh = user_bh ? user_bh : drw->fonts->h + 2;
+ 	updategeom();
+ 	/* init atoms */
+ 	utf8string = XInternAtom(dpy, "UTF8_STRING", False);