Add window rule for heroic games launcher

The natural cycle for dwm-msg is that:
   - the client registers
   - the client sends a message
   - a response is sent back
   - the client deregisters

There is a race condition such that a new client may end up with the same
file descriptor as another command that is deregistering, resulting in a
message to come through from a file descriptor that is not registered.

The handling of this situation is that the IPC patch will log:

   Got event from unknown fd 7, ptr 0x7, u32 7, u64 7 with events 17

before gracefully stopping (exiting) dwm.

The consequence of the error itself seems benign and the proposal here is
to allow dwm to keep running despite not being able to process the dwm-msg
command successfully.

README.md

@@ -1,4 +1,4 @@
-This dwm 6.4 (9f88553, 2023-09-22) side project has a different take on dwm patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. Due to the complexity of some of the patches dwm-flexipatch has diverged from mainstream dwm by making some core patches non-optional for maintenance reasons. For the classic dwm-flexipatch build refer to branch [dwm-flexipatch-1.0](https://github.com/bakkeby/dwm-flexipatch/tree/dwm-flexipatch-1.0).
+This dwm 6.5 (5687f46, 2024-06-08) side project has a different take on dwm patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. Due to the complexity of some of the patches dwm-flexipatch has diverged from mainstream dwm by making some core patches non-optional for maintenance reasons. For the classic dwm-flexipatch build refer to branch [dwm-flexipatch-1.0](https://github.com/bakkeby/dwm-flexipatch/tree/dwm-flexipatch-1.0).
 
 For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/dwm-flexipatch/blob/master/patches.def.h):
 ```c
@@ -19,6 +19,8 @@ Browsing patches? There is a [map of patches](https://coggle.it/diagram/X9IiSSM6
 
 ### Changelog:
 
+2024-07-11 - Added variant of the launcher patch
+
 2024-01-31 - Added the placedir patch
 
 2023-12-22 - Added the do-not-die-on-color-allocation-failure patch
@@ -522,6 +524,9 @@ Browsing patches? There is a [map of patches](https://coggle.it/diagram/X9IiSSM6
    - [killunsel](https://dwm.suckless.org/patches/killunsel/)
       - kills all visible clients that are not selected (only the selected client will remain)
 
+   - [launcher](https://dwm.suckless.org/patches/launcher/)
+      - adds buttons to the bar that can be used to launch applications
+
    - [~leftlayout~](http://dwm.suckless.org/patches/leftlayout/)
       - ~moves the layout symbol in the status bar to the left hand side~
 

config.def.h

@@ -1,3 +1,6 @@
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+#define CMD(...)   { .v = (const char*[]){ __VA_ARGS__, NULL } }
+
 #if ROUNDED_CORNERS_PATCH
 static const unsigned int borderpx       = 0;   /* border pixel of windows */
 static const int corner_radius           = 10;
@@ -425,6 +428,13 @@ static char *statuscolors[][ColCount] = {
 static const char *layoutmenu_cmd = "layoutmenu.sh";
 #endif
 
+#if BAR_LAUNCHER_PATCH
+static const Launcher launchers[] = {
+	/* icon to display      command        */
+	{ "surf",               CMD("surf", "duckduckgo.com") },
+};
+#endif // BAR_LAUNCHER_PATCH
+
 #if COOL_AUTOSTART_PATCH
 static const char *const autostart[] = {
         "st", NULL,
@@ -449,7 +459,7 @@ static char *tagicons[][NUMTAGS] =
 #endif // NAMETAG_PATCH
 {
         /* [DEFAULT_TAGS]        = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, */
-        [DEFAULT_TAGS]        = { "󰍩 ₁", "󰗚 ₂", " ₃", " ₄", "󰖟 ₅", " ₆", "󰊢 ₇", " ₈", " ₉" },
+        [DEFAULT_TAGS]        = { "󰍩 ₁", "󰠮 ₂", " ₃", "󰿎 ₄", "󰖟 ₅", " ₆", "󰊢 ₇", "󰊖 ₈", " ₉" },
         [ALTERNATIVE_TAGS]    = { "A", "B", "C", "D", "E", "F", "G", "H", "I" },
         [ALT_TAGS_DECORATION] = { "<1>", "<2>", "<3>", "<4>", "<5>", "<6>", "<7>", "<8>", "<9>" },
 };
@@ -473,16 +483,33 @@ static const Rule rules[] = {
         RULE(.wintype = WTYPE "UTILITY", .isfloating = 1)
         RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
         RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
+        RULE(.wintype = WTYPE "NOTIFICATION", .unmanaged = 1) // 1 - the window will be placed above all other windows
+        RULE(.title = "notificationtoasts_11_desktop", .unmanaged = 1) // 1 - the window will be placed above all other windows
         RULE(.title = "Picture in picture", .isfloating = 1)
-        RULE(.class = "Ferdium", .tags = 1 << 0)
         RULE(.class = "Beeper", .tags = 1 << 0)
         RULE(.class = "Signal", .tags = 1 << 0)
         RULE(.class = "discord", .tags = 1 << 0)
-        RULE(.class = "notion-app-enhanced", .tags = 1 << 1)
+        RULE(.class = "zoom", .tags = 1 << 0)
         RULE(.class = "Logseq", .tags = 1 << 1)
+        RULE(.class = "obsidian", .tags = 1 << 1)
+        RULE(.class = "anytype", .tags = 1 << 1)
         RULE(.class = "pocket-casts-linux", .tags = 1 << 2)
-        RULE(.class = "Spotify", .tags = 1 << 3)
+        RULE(.class = "Spotify", .tags = 1 << 2)
+        RULE(.class = "Pavucontrol", .tags = 1 << 2)
+        RULE(.class = "easyeffects", .tags = 1 << 2)
+        RULE(.class = "NoiseTorch", .tags = 1 << 2)
+        RULE(.class = "Audacity", .tags = 1 << 2)
+        RULE(.class = "mpv", .tags = 1 << 3)
+        RULE(.class = "vlc", .tags = 1 << 3)
+        RULE(.class = "Ristretto", .tags = 1 << 3)
+        RULE(.class = "trackma-qt", .tags = 1 << 3)
+        RULE(.class = "Trackma-gtk", .tags = 1 << 3)
+        RULE(.class = "obs", .tags = 1 << 3)
+        RULE(.class = "kdenlive", .tags = 1 << 3)
+        RULE(.class = "Blender", .tags = 1 << 3)
+        RULE(.title = "GNU Image Manipulation Program", .tags = 1 << 3)
         RULE(.class = "Vivaldi-stable", .tags = 1 << 4)
+        RULE(.class = "Links", .tags = 1 << 4)
         RULE(.class = "kitty", .tags = 1 << 5, .isterminal = 1)
         RULE(.class = "Emacs", .tags = 1 << 6)
         RULE(.class = "Code", .tags = 1 << 6)
@@ -490,12 +517,12 @@ static const Rule rules[] = {
         RULE(.title = "Steam", .tags = 1 << 7)
         RULE(.class = "Lutris", .tags = 1 << 7)
         RULE(.class = "gamescope", .tags = 1 << 7)
+        RULE(.class = "Oversteer", .tags = 1 << 7)
+        RULE(.class = "PrismLauncher", .tags = 1 << 7)
+        RULE(.class = "antimicrox", .tags = 1 << 7)
+        RULE(.class = "ProtonUp-Qt", .tags = 1 << 7)
+        RULE(.class = "heroic", .tags = 1 << 7)
         RULE(.class = "Thunar", .tags = 1 << 8)
-        RULE(.class = "trackma", .tags = 1 << 8)
-        RULE(.class = "Trackma-gtk", .tags = 1 << 8)
-        RULE(.class = "obs", .tags = 1 << 8)
-        RULE(.class = "NoiseTorch", .tags = 1 << 8)
-        RULE(.class = "kdenlive", .tags = 1 << 8)
         RULE(.class = "Syncthing GTK", .tags = 1 << 8)
         RULE(.class = "Nyrna", .tags = 1 << 8)
         RULE(.class = "openrgb", .tags = 1 << 8)
@@ -537,6 +564,9 @@ static const BarRule barrules[] = {
         #if BAR_STATUSBUTTON_PATCH
         { -1,        0,     BAR_ALIGN_LEFT,   width_stbutton,           draw_stbutton,          click_stbutton,          NULL,                    "statusbutton" },
         #endif // BAR_STATUSBUTTON_PATCH
+        #if BAR_LAUNCHER_PATCH
+        { -1,        0,     BAR_ALIGN_LEFT,   width_launcher,           draw_launcher,          click_launcher,          NULL,                    "launcher" },
+        #endif // BAR_LAUNCHER_PATCH
         #if BAR_POWERLINE_TAGS_PATCH
         {  0,        0,     BAR_ALIGN_LEFT,   width_pwrl_tags,          draw_pwrl_tags,         click_pwrl_tags,         hover_pwrl_tags,         "powerline_tags" },
         #endif // BAR_POWERLINE_TAGS_PATCH
@@ -844,9 +874,6 @@ static const char *xkb_layouts[]  = {
 #define HOLDKEY 0 // replace 0 with the keysym to activate holdbar
 #endif // BAR_HOLDBAR_PATCH
 
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
 #if !NODMENU_PATCH
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 #endif // NODMENU_PATCH
@@ -873,7 +900,7 @@ static const char *clipboardcmd[]        = { "rofi", "-show", "clipboard", NULL
 static const char *rbwcmd[]              = { "rofi-rbw", NULL };
 static const char *volumecmd[]           = { "/home/sravan/.scripts/pactl.sh", "--rofi", NULL };
 static const char *mediacmd[]            = { "/home/sravan/.scripts/playerctl.sh", "--rofi", NULL };
-static const char *notificationcmd[]     = { "/home/sravan/.scripts/deadd.sh", "--rofi", NULL };
+static const char *notificationcmd[]     = { "/home/sravan/.scripts/dunst.sh", "--rofi", NULL };
 static const char *sessioncmd[]          = { "/home/sravan/.scripts/session.sh", "--rofi", NULL };
 static const char *compositorcmd[]       = { "/home/sravan/.scripts/picom.sh", "--rofi", NULL };
 static const char *lowervolumecmd[]      = { "/home/sravan/.scripts/pactl.sh", "--lower", NULL };

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 6.4
+VERSION = 6.5
 
 # Customize below to fit your system
 
@@ -29,7 +29,7 @@ FREETYPEINC = /usr/include/freetype2
 #KVMLIB = -lkvm
 
 # Uncomment this for the alpha patch and the winicon patch (BAR_ALPHA_PATCH, BAR_WINICON_PATCH)
-XRENDER = -lXrender
+#XRENDER = -lXrender
 
 # Uncomment this for the mdpcontrol patch / MDPCONTROL_PATCH
 #MPDCLIENT = -lmpdclient

drw.c

@@ -436,10 +436,10 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
 {
 #if BAR_PANGO_PATCH
 	char buf[1024];
-	int ty;
-	unsigned int ew;
+	int i, ty, th;
+	unsigned int ew, eh;
 	XftDraw *d = NULL;
-	size_t i, len;
+	size_t len;
 	int render = x || y || w || h;
 
 	if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
@@ -464,10 +464,14 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
 	len = strlen(text);
 
 	if (len) {
-		drw_font_getexts(drw->fonts, text, len, &ew, NULL, markup);
+		drw_font_getexts(drw->fonts, text, len, &ew, &eh, markup);
+		th = eh;
 		/* shorten text if necessary */
-		for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--)
-			drw_font_getexts(drw->fonts, text, len, &ew, NULL, markup);
+		for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--) {
+			drw_font_getexts(drw->fonts, text, len, &ew, &eh, markup);
+			if (eh > th)
+				th = eh;
+		}
 
 		if (len) {
 			memcpy(buf, text, len);
@@ -477,7 +481,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
 					; /* NOP */
 
 			if (render) {
-				ty = y + (h - drw->fonts->h) / 2;
+				ty = y + (h - th) / 2;
 				if (markup)
 					pango_layout_set_markup(drw->fonts->layout, buf, len);
 				else
@@ -709,7 +713,7 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w,
 	if (w)
 		*w = r.width / PANGO_SCALE;
 	if (h)
-		*h = font->h;
+		*h = r.height / PANGO_SCALE;
 }
 #else
 void

dwm.c

@@ -482,6 +482,9 @@ struct Monitor {
 	int gappiv;           /* vertical gap between windows */
 	int gappoh;           /* horizontal outer gaps */
 	int gappov;           /* vertical outer gaps */
+	#if PERMON_VANITYGAPS_PATCH
+	int enablegaps;       /* whether gaps are enabled  */
+	#endif // PERMON_VANITYGAPS_PATCH
 	#endif // VANITYGAPS_PATCH
 	#if SETBORDERPX_PATCH
 	int borderpx;
@@ -685,6 +688,9 @@ static void maprequest(XEvent *e);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
+#if NOBORDER_PATCH
+static int noborder(Client *c);
+#endif // NOBORDER_PATCH
 #if !ZOOMSWAP_PATCH || TAGINTOSTACK_ALLMASTER_PATCH || TAGINTOSTACK_ONEMASTER_PATCH
 static void pop(Client *c);
 #endif // !ZOOMSWAP_PATCH / TAGINTOSTACK_ALLMASTER_PATCH / TAGINTOSTACK_ONEMASTER_PATCH
@@ -962,6 +968,7 @@ applyrules(Client *c)
 			if (r->switchtag)
 			#endif // SWALLOW_PATCH
 			{
+				unfocus(selmon->sel, 1, NULL);
 				selmon = c->mon;
 				if (r->switchtag == 2 || r->switchtag == 4)
 					newtagset = c->mon->tagset[c->mon->seltags] ^ c->tags;
@@ -1105,6 +1112,11 @@ arrange(Monitor *m)
 void
 arrangemon(Monitor *m)
 {
+	#if BAR_PADDING_SMART_PATCH
+	updatebarpos(selmon);
+	for (Bar *bar = selmon->bar; bar; bar = bar->next)
+		XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+	#endif // BAR_PADDING_SMART_PATCH
 	#if TAB_PATCH
 	updatebarpos(m);
 	XMoveResizeWindow(dpy, m->tabwin, m->wx, m->ty, m->ww, th);
@@ -1458,6 +1470,15 @@ configure(Client *c)
 	ce.width = c->w;
 	ce.height = c->h;
 	ce.border_width = c->bw;
+
+	#if NOBORDER_PATCH
+	if (noborder(c)) {
+		ce.width += c->bw * 2;
+		ce.height += c->bw * 2;
+		ce.border_width = 0;
+	}
+	#endif // NOBORDER_PATCH
+
 	ce.above = None;
 	ce.override_redirect = False;
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
@@ -1769,6 +1790,10 @@ createmon(void)
 	}
 	#endif // PERTAG_PATCH
 
+	#if PERMON_VANITYGAPS_PATCH
+	m->enablegaps = 1;
+	#endif // PERMON_VANITYGAPS_PATCH
+
 	#if SEAMLESS_RESTART_PATCH
 	restoremonitorstate(m);
 	#endif // SEAMLESS_RESTART_PATCH
@@ -2492,8 +2517,10 @@ manage(Window w, XWindowAttributes *wa)
 		#endif // CENTER_TRANSIENT_WINDOWS_PATCH | CENTER_TRANSIENT_WINDOWS_BY_PARENT_PATCH | CENTER_PATCH
 	} else {
 		#if SEAMLESS_RESTART_PATCH
-		if (!settings_restored)
+		if (!settings_restored || c->mon == NULL) {
 			c->mon = selmon;
+			settings_restored = 0;
+		}
 		#else
 		c->mon = selmon;
 		#endif // SEAMLESS_RESTART_PATCH
@@ -2850,6 +2877,52 @@ nexttiled(Client *c)
 	return c;
 }
 
+#if NOBORDER_PATCH
+int
+noborder(Client *c)
+{
+	int monocle_layout = 0;
+
+	#if MONOCLE_LAYOUT
+	if (&monocle == c->mon->lt[c->mon->sellt]->arrange)
+		monocle_layout = 1;
+	#endif // MONOCLE_LAYOUT
+
+	#if DECK_LAYOUT
+	if (&deck == c->mon->lt[c->mon->sellt]->arrange && c->mon->nmaster == 0)
+		monocle_layout = 1;
+	#endif // DECK_LAYOUT
+
+	#if FLEXTILE_DELUXE_LAYOUT
+	if (&flextile == c->mon->lt[c->mon->sellt]->arrange && (
+		(c->mon->ltaxis[LAYOUT] == NO_SPLIT && c->mon->ltaxis[MASTER] == MONOCLE) ||
+		(c->mon->ltaxis[STACK] == MONOCLE && c->mon->nmaster == 0)
+	)) {
+		monocle_layout = 1;
+	}
+	#endif //FLEXTILE_DELUXE_LAYOUT
+
+	if (!monocle_layout && (nexttiled(c->mon->clients) != c || nexttiled(c->next)))
+		return 0;
+
+	if (c->isfloating)
+		return 0;
+
+	if (!c->mon->lt[c->mon->sellt]->arrange)
+		return 0;
+
+	#if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
+	if (c->fakefullscreen != 1 && c->isfullscreen)
+		return 0;
+	#elif !FAKEFULLSCREEN_PATCH
+	if (c->isfullscreen)
+		return 0;
+	#endif // FAKEFULLSCREEN_CLIENT_PATCH
+
+	return 1;
+}
+#endif // NOBORDER_PATCH
+
 #if !ZOOMSWAP_PATCH || TAGINTOSTACK_ALLMASTER_PATCH || TAGINTOSTACK_ONEMASTER_PATCH
 void
 pop(Client *c)
@@ -3004,31 +3077,9 @@ resizeclient(Client *c, int x, int y, int w, int h)
 	drawroundedcorners(c);
 	#endif // ROUNDED_CORNERS_PATCH
 	#if NOBORDER_PATCH
-	if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
-		#if MONOCLE_LAYOUT
-		|| &monocle == c->mon->lt[c->mon->sellt]->arrange
-		#endif // MONOCLE_LAYOUT
-		#if DECK_LAYOUT
-		|| (&deck == c->mon->lt[c->mon->sellt]->arrange &&
-			c->mon->nmaster == 0)
-		#endif // DECK_LAYOUT
-		#if FLEXTILE_DELUXE_LAYOUT
-		|| (&flextile == c->mon->lt[c->mon->sellt]->arrange && (
-			(c->mon->ltaxis[LAYOUT] == NO_SPLIT &&
-			 c->mon->ltaxis[MASTER] == MONOCLE) ||
-			(c->mon->ltaxis[STACK] == MONOCLE &&
-			 c->mon->nmaster == 0)))
-		#endif //FLEXTILE_DELUXE_LAYOUT
-		)
-		#if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
-		&& (c->fakefullscreen == 1 || !c->isfullscreen)
-		#else
-		&& !c->isfullscreen
-		#endif // FAKEFULLSCREEN_CLIENT_PATCH
-		&& !c->isfloating
-		&& c->mon->lt[c->mon->sellt]->arrange) {
-		c->w = wc.width += c->bw * 2;
-		c->h = wc.height += c->bw * 2;
+	if (noborder(c)) {
+		wc.width += c->bw * 2;
+		wc.height += c->bw * 2;
 		wc.border_width = 0;
 	}
 	#endif // NOBORDER_PATCH
@@ -3262,7 +3313,6 @@ run(void)
 				event_fd, events[i].data.ptr, events[i].data.u32,
 				events[i].data.u64);
 				fprintf(stderr, " with events %d\n", events[i].events);
-				return;
 			}
 		}
 	}
@@ -4233,10 +4283,21 @@ togglefloating(const Arg *arg)
 	#endif // !FAKEFULLSCREEN_PATCH
 	c->isfloating = !c->isfloating || c->isfixed;
 	#if !BAR_FLEXWINTITLE_PATCH
+	#if RENAMED_SCRATCHPADS_PATCH
+	if (c->scratchkey != 0 && c->isfloating)
+		XSetWindowBorder(dpy, c->win, scheme[SchemeScratchSel][ColFloat].pixel);
+	else if (c->scratchkey != 0)
+		XSetWindowBorder(dpy, c->win, scheme[SchemeScratchSel][ColBorder].pixel);
+	else if (c->isfloating)
+		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColFloat].pixel);
+	else
+		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+	#else
 	if (c->isfloating)
 		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColFloat].pixel);
 	else
 		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+	#endif // RENAMED_SCRATCHPADS_PATCH
 	#endif // BAR_FLEXWINTITLE_PATCH
 	if (c->isfloating) {
 		#if SAVEFLOATS_PATCH || EXRESIZE_PATCH
@@ -4651,16 +4712,36 @@ updatebarpos(Monitor *m)
 	#if BAR_PADDING_VANITYGAPS_PATCH && VANITYGAPS_PATCH
 	#if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH
 	if (!selmon || selmon->pertag->enablegaps[selmon->pertag->curtag])
+	#elif PERMON_VANITYGAPS_PATCH
+	if (!selmon || selmon->enablegaps)
 	#else
 	if (enablegaps)
 	#endif // PERTAG_VANITYGAPS_PATCH
 	{
+		#if BAR_PADDING_SMART_PATCH
+		unsigned int n; Client *c;
+		for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+		if (n > 1) {
 			y_pad = gappoh;
 			x_pad = gappov;
 		}
+		#else
+		y_pad = gappoh;
+		x_pad = gappov;
+		#endif // BAR_PADDING_SMART_PATCH
+	}
 	#elif BAR_PADDING_PATCH
+	#if BAR_PADDING_SMART_PATCH
+	unsigned int n; Client *c;
+	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+	if (n > 1) {
 		y_pad = vertpad;
 		x_pad = sidepad;
+	}
+	#else
+	y_pad = vertpad;
+	x_pad = sidepad;
+	#endif // BAR_PADDING_SMART_PATCH
 	#endif // BAR_PADDING_PATCH | BAR_PADDING_VANITYGAPS_PATCH
 
 	#if INSETS_PATCH
@@ -4715,7 +4796,7 @@ updatebarpos(Monitor *m)
 }
 
 void
-updateclientlist()
+updateclientlist(void)
 {
 	Client *c;
 	Monitor *m;

justfile

@@ -0,0 +1,13 @@
+set shell := ["bash", "-c"]
+
+# List just commands by default
+default:
+    @just --list
+
+# Update doom emacs and sync config
+dwm-rebuild:
+    sudo make clean install
+
+# Run polybar launch script
+dwm-launch-polybar:
+    ./polybar/launch.sh

patch/bar_launcher.c

@@ -0,0 +1,81 @@
+#if BAR_STATUS2D_PATCH
+int
+width_launcher(Bar *bar, BarArg *a)
+{
+	int i, x = 0;
+
+	for (i = 0; i < LENGTH(launchers); i++) {
+		x += status2dtextlength(launchers[i].name) + lrpad;
+	}
+	return x;
+}
+
+int
+draw_launcher(Bar *bar, BarArg *a)
+{
+	int i, w = 0;;
+
+	for (i = 0; i < LENGTH(launchers); i++) {
+		w = status2dtextlength(launchers[i].name);
+		drawstatusbar(a, launchers[i].name);
+		a->x += w + lrpad;
+	}
+
+	return a->x ;
+}
+
+int
+click_launcher(Bar *bar, Arg *arg, BarArg *a)
+{
+	int i, x = 0;
+
+	for (i = 0; i < LENGTH(launchers); i++) {
+		x += status2dtextlength(launchers[i].name) + lrpad;
+		if (a->x < x) {
+		    spawn(&launchers[i].command);
+		    break;
+		}
+	}
+	return -1;
+}
+#else
+int
+width_launcher(Bar *bar, BarArg *a)
+{
+	int i, x = 0;
+
+	for (i = 0; i < LENGTH(launchers); i++) {
+		x += TEXTW(launchers[i].name);
+	}
+	return x;
+}
+
+int
+draw_launcher(Bar *bar, BarArg *a)
+{
+	int i, x = 0, w = 0;;
+
+	for (i = 0; i < LENGTH(launchers); i++) {
+		w = TEXTW(launchers[i].name);
+		drw_text(drw, x, 0, w, bh, lrpad / 2, launchers[i].name, 0, True);
+		x += w;
+	}
+
+	return x;
+}
+
+int
+click_launcher(Bar *bar, Arg *arg, BarArg *a)
+{
+	int i, x = 0;
+
+	for (i = 0; i < LENGTH(launchers); i++) {
+		x += TEXTW(launchers[i].name);
+		if (a->x < x) {
+		    spawn(&launchers[i].command);
+		    break;
+		}
+	}
+	return -1;
+}
+#endif // BAR_STATUS2D_PATCH

patch/bar_launcher.h

@@ -0,0 +1,8 @@
+typedef struct {
+	char* name;
+	const Arg command;
+} Launcher;
+
+static int width_launcher(Bar *bar, BarArg *a);
+static int draw_launcher(Bar *bar, BarArg *a);
+static int click_launcher(Bar *bar, Arg *arg, BarArg *a);

patch/bar_ltsymbol.c

@@ -15,4 +15,3 @@ click_ltsymbol(Bar *bar, Arg *arg, BarArg *a)
 {
 	return ClkLtSymbol;
 }
-

patch/bar_ltsymbol.h

@@ -1,4 +1,3 @@
 static int width_ltsymbol(Bar *bar, BarArg *a);
 static int draw_ltsymbol(Bar *bar, BarArg *a);
 static int click_ltsymbol(Bar *bar, Arg *arg, BarArg *a);
-

patch/bar_powerline_tags.c

@@ -102,6 +102,11 @@ click_pwrl_tags(Bar *bar, Arg *arg, BarArg *a)
 	if (i < NUMTAGS) {
 		arg->ui = 1 << i;
 	}
+	#if BAR_TAGPREVIEW_PATCH
+	if (selmon->previewshow != 0) {
+		hidetagpreview(selmon);
+	}
+	#endif // BAR_TAGPREVIEW_PATCH
 	return ClkTagBar;
 }
 

patch/bar_status2d.c

@@ -96,6 +96,7 @@ drawstatusbar(BarArg *a, char* stext)
 	#else
 	memcpy(text, stext, len);
 	#endif // BAR_STATUSCMD_PATCH
+	text[len] = '\0';
 
 	x += lrpad / 2;
 	drw_setscheme(drw, scheme[LENGTH(colors)]);

patch/bar_systray.c

@@ -94,6 +94,12 @@ draw_systray(Bar *bar, BarArg *a)
 			i->mon = bar->mon;
 	}
 
+	#if !BAR_ALPHA_PATCH
+	wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
+	XChangeWindowAttributes(dpy, systray->win, CWBackPixel, &wa);
+	XClearWindow(dpy, systray->win);
+	#endif // BAR_ALPHA_PATCH
+
 	XMoveResizeWindow(dpy, systray->win, bar->bx + a->x + lrpad / 2, (w ? bar->by + a->y + (a->h - systray->h) / 2: -systray->h), MAX(w, 1), systray->h);
 	return w;
 }

patch/bar_taglabels.c

@@ -87,6 +87,11 @@ click_taglabels(Bar *bar, Arg *arg, BarArg *a)
 	if (i < NUMTAGS) {
 		arg->ui = 1 << i;
 	}
+	#if BAR_TAGPREVIEW_PATCH
+	if (selmon->previewshow != 0) {
+		hidetagpreview(selmon);
+	}
+	#endif // BAR_TAGPREVIEW_PATCH
 	return ClkTagBar;
 }
 

patch/bar_tags.c

@@ -88,6 +88,11 @@ click_tags(Bar *bar, Arg *arg, BarArg *a)
 	if (i < NUMTAGS) {
 		arg->ui = 1 << i;
 	}
+	#if BAR_TAGPREVIEW_PATCH
+	if (selmon->previewshow != 0) {
+		hidetagpreview(selmon);
+	}
+	#endif // BAR_TAGPREVIEW_PATCH
 	return ClkTagBar;
 }
 

patch/include.c

@@ -21,6 +21,9 @@
 #if COMBO_PATCH
 #include "combo.c"
 #endif
+#if BAR_LAUNCHER_PATCH
+#include "bar_launcher.c"
+#endif
 #if BAR_LTSYMBOL_PATCH
 #include "bar_ltsymbol.c"
 #endif

patch/include.h

@@ -24,6 +24,9 @@
 #if BAR_HOLDBAR_PATCH
 #include "bar_holdbar.h"
 #endif
+#if BAR_LAUNCHER_PATCH
+#include "bar_launcher.h"
+#endif
 #if BAR_LTSYMBOL_PATCH
 #include "bar_ltsymbol.h"
 #endif

patch/seamless_restart.c

@@ -39,12 +39,12 @@ persistclientstate(Client *c)
 int
 restoreclientstate(Client *c)
 {
-	return getclienttags(c)
-		| getclientfields(c)
+	int restored = getclientfields(c);
+	getclienttags(c);
 	#if SAVEFLOATS_PATCH
-		| restorewindowfloatposition(c, c->mon ? c->mon : selmon)
+	restorewindowfloatposition(c, c->mon ? c->mon : selmon);
 	#endif // SAVEFLOATS_PATCH
-	;
+	return restored;
 }
 
 void setmonitorfields(Monitor *m)

patch/swallow.c

@@ -13,6 +13,9 @@ swallow(Client *p, Client *c)
 {
 	Client *s;
 	XWindowChanges wc;
+	#if NOBORDER_PATCH
+	int border_padding = 0;
+	#endif // NOBORDER_PATCH
 
 	if (c->noswallow > 0 || c->isterminal)
 		return 0;
@@ -46,9 +49,21 @@ swallow(Client *p, Client *c)
 	setfloatinghint(s);
 	#endif // BAR_EWMHTAGS_PATCH
 
+	#if NOBORDER_PATCH
+	wc.border_width = p->bw;
+	if (noborder(p)) {
+		wc.border_width = 0;
+		border_padding = p->bw * 2;
+	}
+
+	XConfigureWindow(dpy, p->win, CWBorderWidth, &wc);
+	XMoveResizeWindow(dpy, p->win, s->x, s->y, s->w + border_padding, s->h + border_padding);
+	#else
 	wc.border_width = p->bw;
 	XConfigureWindow(dpy, p->win, CWBorderWidth, &wc);
 	XMoveResizeWindow(dpy, p->win, s->x, s->y, s->w, s->h);
+	#endif // NOBORDER_PATCH
+
 	#if !BAR_FLEXWINTITLE_PATCH
 	XSetWindowBorder(dpy, p->win, scheme[SchemeNorm][ColBorder].pixel);
 	#endif // BAR_FLEXWINTITLE_PATCH
@@ -65,6 +80,9 @@ unswallow(Client *c)
 {
 	XWindowChanges wc;
 	c->win = c->swallowing->win;
+	#if NOBORDER_PATCH
+	int border_padding = 0;
+	#endif // NOBORDER_PATCH
 
 	free(c->swallowing);
 	c->swallowing = NULL;
@@ -80,9 +98,20 @@ unswallow(Client *c)
 	arrange(c->mon);
 	XMapWindow(dpy, c->win);
 
+	#if NOBORDER_PATCH
+	wc.border_width = c->bw;
+	if (noborder(c)) {
+		wc.border_width = 0;
+		border_padding = c->bw * 2;
+	}
+
+	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
+	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w + border_padding, c->h + border_padding);
+	#else
 	wc.border_width = c->bw;
 	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+	#endif // NOBORDER_PATCH
 	#if !BAR_FLEXWINTITLE_PATCH
 	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
 	#endif // BAR_FLEXWINTITLE_PATCH

patch/vanitygaps.c

@@ -1,5 +1,5 @@
 /* Settings */
-#if !PERTAG_VANITYGAPS_PATCH
+#if !(PERTAG_VANITYGAPS_PATCH || PERMON_VANITYGAPS_PATCH)
 static int enablegaps = 1;
 #endif // PERTAG_VANITYGAPS_PATCH
 
@@ -69,10 +69,12 @@ setgapsex(const Arg *arg)
 	#if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH
 	if (!selmon->pertag->enablegaps[selmon->pertag->curtag])
 		selmon->pertag->enablegaps[selmon->pertag->curtag] = 1;
+	#elif PERMON_VANITYGAPS_PATCH
+		selmon->enablegaps = 1;
 	#else
 	if (!enablegaps)
 		enablegaps = 1;
-	#endif // PERTAG_VANITYGAPS_PATCH
+	#endif // PERTAG_VANITYGAPS_PATCH | PERMON_VANITYGAPS_PATCH
 
 	setgaps(oh, ov, ih, iv);
 }
@@ -83,24 +85,35 @@ togglegaps(const Arg *arg)
 {
 	#if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH
 	selmon->pertag->enablegaps[selmon->pertag->curtag] = !selmon->pertag->enablegaps[selmon->pertag->curtag];
+	#elif PERMON_VANITYGAPS_PATCH
+	selmon->enablegaps = !selmon->enablegaps;
 	#else
 	enablegaps = !enablegaps;
-	#endif // PERTAG_VANITYGAPS_PATCH
+	#endif // PERTAG_VANITYGAPS_PATCH | PERMON_VANITYGAPS_PATCH
 
 	#if BAR_PADDING_VANITYGAPS_PATCH
+	#if PERMON_VANITYGAPS_PATCH
 	updatebarpos(selmon);
 	for (Bar *bar = selmon->bar; bar; bar = bar->next)
 		XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+	#else
+	for (Monitor *m = mons; m; m = m->next) {
+		updatebarpos(m);
+		for (Bar *bar = m->bar; bar; bar = bar->next)
+			XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+	}
+	#endif // PERMON_VANITYGAPS_PATCH
 
 	#if BAR_SYSTRAY_PATCH
 	drawbarwin(systray->bar);
 	#endif // BAR_SYSTRAY_PATCH
 	#endif // BAR_PADDING_VANITYGAPS_PATCH
-	#if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH
+
+	#if (PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH) || PERMON_VANITYGAPS_PATCH
 	arrange(selmon);
 	#else
 	arrange(NULL);
-	#endif // PERTAG_VANITYGAPS_PATCH
+	#endif // PERTAG_VANITYGAPS_PATCH | PERMON_VANITYGAPS_PATCH
 }
 
 static void
@@ -193,9 +206,11 @@ getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc)
 	unsigned int n, oe, ie;
 	#if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH
 	oe = ie = m->pertag->enablegaps[m->pertag->curtag];
+	#elif PERMON_VANITYGAPS_PATCH
+	oe = ie = m->enablegaps;
 	#else
 	oe = ie = enablegaps;
-	#endif // PERTAG_VANITYGAPS_PATCH
+	#endif // PERTAG_VANITYGAPS_PATCH | PERMON_VANITYGAPS_PATCH
 	Client *c;
 
 	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);

patch/xrdb.c

@@ -132,6 +132,11 @@ xrdb(const Arg *arg)
 		#endif // BAR_ALPHA_PATCH
 		ColCount
 		);
+	#if BAR_SYSTRAY_PATCH && !BAR_ALPHA_PATCH
+	if (systray) {
+		XMoveWindow(dpy, systray->win, -32000, -32000);
+	}
+	#endif // BAR_SYSTRAY_PATCH
 	arrange(NULL);
 	focus(NULL);
 }

patches.def.h

@@ -8,6 +8,8 @@
 
 #define BAR_FLEXWINTITLE_PATCH 0
 
+#define BAR_LAUNCHER_PATCH 0
+
 #define BAR_LAYOUTMENU_PATCH 0
 
 #define BAR_LTSYMBOL_PATCH 0
@@ -51,9 +53,9 @@
 #define BAR_TITLE_RIGHT_PAD_PATCH 0
 #define BAR_TITLE_LEFT_PAD_PATCH 0
 
-#define BAR_ACTIVETAGINDICATORBAR_PATCH N/A
+#define BAR_ACTIVETAGINDICATORBAR_PATCH 0
 
-#define BAR_ACTIVETAGINDICATORBAR_ALT1_PATCH N/A
+#define BAR_ACTIVETAGINDICATORBAR_ALT1_PATCH 0
 
 #define BAR_ALPHA_PATCH 0
 
@@ -71,7 +73,7 @@
 
 #define BAR_CENTEREDWINDOWNAME_PATCH 0
 
-#define BAR_CLIENTINDICATOR_PATCH N/A
+#define BAR_CLIENTINDICATOR_PATCH 0
 
 #define BAR_DMENUMATCHTOP_PATCH 0
 
@@ -91,6 +93,10 @@
 
 #define BAR_PADDING_PATCH 0
 
+#define BAR_PADDING_VANITYGAPS_PATCH 0
+
+#define BAR_PADDING_SMART_PATCH 0
+
 #define BAR_PANGO_PATCH 0
 
 #define BAR_STATICSTATUS_PATCH 0
@@ -241,6 +247,8 @@
 
 #define PERTAGBAR_PATCH 0
 
+#define PERMON_VANITYGAPS_PATCH 0
+
 #define PLACEDIR_PATCH 0
 
 #define PLACEMOUSE_PATCH 1
@@ -355,7 +363,7 @@
 
 #define UNFLOATVISIBLE_PATCH 1
 
-#define UNMANAGED_PATCH 0
+#define UNMANAGED_PATCH 1
 
 #define VANITYGAPS_PATCH 1
 

polybar/config.ini

@@ -11,7 +11,7 @@ yellow                    = ${xrdb:color3:#F1FA8C}
 green                     = ${xrdb:color2:#50FA7B}
 orange                    = ${xrdb:color16:#FFB86C}
 
-background                = ${self.dark-gray}
+background                = #CC282A36
 background-alt            = ${self.light-gray}
 foreground                = ${self.white}
 foreground-alt            = ${self.lighter-gray}
@@ -20,8 +20,8 @@ secondary                 = ${self.blue}
 alert                     = ${self.red}
 
 ; left
-powermenu-foreground      = ${self.background}
-powermenu-background      = ${self.blue}
+powermenu-foreground      = ${self.blue}
+powermenu-background      = ${self.background}
 powermenu-underline       = ${self.background}
 powermenu-overline        = ${self.background}
 
@@ -65,49 +65,67 @@ dwm-empty-background      = ${self.background}
 dwm-empty-underline       = ${self.background}
 dwm-empty-overline        = ${self.background}
 
-media-playing-foreground  = ${self.background}
-media-playing-background  = ${self.green}
+media-playing-foreground  = ${self.green}
+media-playing-background  = ${self.background}
 media-playing-underline   = ${self.background}
 media-playing-overline    = ${self.background}
 
+; center
+tray-background           = ${self.background}
+
 ; right
-kernel-foreground         = ${self.background}
-kernel-background         = ${self.orange}
+system76-power-foreground = ${self.green}
+system76-power-background = ${self.background}
+system76-power-underline  = ${self.background}
+system76-power-overline   = ${self.background}
+
+kernel-foreground         = ${self.orange}
+kernel-background         = ${self.background}
 kernel-underline          = ${self.background}
 kernel-overline           = ${self.background}
 
-cpu-foreground            = ${self.background}
-cpu-background            = ${self.purple}
+cpu-foreground            = ${self.purple}
+cpu-background            = ${self.background}
 cpu-underline             = ${self.background}
 cpu-overline              = ${self.background}
 
-memory-foreground         = ${self.background}
-memory-background         = ${self.blue}
+memory-foreground         = ${self.blue}
+memory-background         = ${self.background}
 memory-underline          = ${self.background}
 memory-overline           = ${self.background}
 
-filesystem-foreground     = ${self.background}
-filesystem-background     = ${self.pink}
+filesystem-foreground     = ${self.pink}
+filesystem-background     = ${self.background}
 filesystem-underline      = ${self.background}
 filesystem-overline       = ${self.background}
 
-date-foreground           = ${self.background}
-date-background           = ${self.yellow}
+date-foreground           = ${self.yellow}
+date-background           = ${self.background}
 date-underline            = ${self.background}
 date-overline             = ${self.background}
 
-time-foreground           = ${self.background}
-time-background           = ${self.purple}
+time-foreground           = ${self.purple}
+time-background           = ${self.background}
 time-underline            = ${self.background}
 time-overline             = ${self.background}
 
-deadd-notification-center-foreground = ${self.background}
-deadd-notification-center-background = ${self.green}
+deadd-notification-center-foreground = ${self.green}
+deadd-notification-center-background = ${self.background}
 deadd-notification-center-underline  = ${self.background}
 deadd-notification-center-overline   = ${self.background}
 
-volume-foreground           = ${self.background}
-volume-background           = ${self.red}
+dunst-foreground = ${self.green}
+dunst-background = ${self.background}
+dunst-underline  = ${self.background}
+dunst-overline   = ${self.background}
+
+xfce4-notifyd-foreground = ${self.green}
+xfce4-notifyd-background = ${self.background}
+xfce4-notifyd-underline  = ${self.background}
+xfce4-notifyd-overline   = ${self.background}
+
+volume-foreground           = ${self.red}
+volume-background           = ${self.background}
 volume-underline            = ${self.background}
 volume-overline             = ${self.background}
 
@@ -121,13 +139,15 @@ tray-scale          = ${xrdb:polybar.tray-scale:1}
 maxlen              = ${xrdb:polybar.maxlen:50}
 
 [intervals]
+media-playing  = 1
+system76-power = 86400
+kernel         = 86400
 cpu            = 1
+memory         = 1
+filesystem     = 600
 date           = 1
 time           = 1
-filesystem                = 900
-memory                    = 1
-media-playing             = 1
-kernel                    = 86400
+dunst          = 1
 
 [global/wm]
 ; Adjust the _NET_WM_STRUT_PARTIAL top value
@@ -210,8 +230,8 @@ radius = 10.0
 ; Individual values can be defined using:
 ;   {overline,underline}-size
 ;   {overline,underline}-color
-overline-size  = 4
-underline-size = 4
+overline-size  = 0
+underline-size = 0
 
 ; Values applied to all borders
 ; Individual side values can be defined using:
@@ -255,6 +275,9 @@ font-2 = "DroidSansM Nerd Font:size=11;3"
 font-3 = "IPAPGothic:size=11;3"
 font-4 = "Baekmuk Dotum:size=11;3"
 font-5 = "IPAPGothic:size=11;3"
+font-6 = "NotoSansNerdFont:size=11;3"
+font-7 = "NotoSansCJK:size=11;3"
+font-8 = "NotoSansYi:size=11;3"
 
 ; Modules are added to one of the available blocks
 ;   modules-left = cpu ram
@@ -262,7 +285,7 @@ font-5 = "IPAPGothic:size=11;3"
 ;   modules-right = ipc clock
 modules-left   = powermenu-left powermenu powermenu-right dwm volume-left volume volume-right media-playing-left media-playing-change media-playing-prev media-playing-play-pause media-playing-next media-playing media-playing-right
 ; modules-center =
-modules-right  = kernel-left kernel kernel-right cpu-left cpu cpu-right memory-left memory memory-right filesystem-left filesystem filesystem-right date-left date date-right time-left time time-right deadd-notification-center-left deadd-notification-center deadd-notification-center-right
+modules-right  = kernel-left kernel kernel-right system76-power-left system76-power system76-power-right cpu-left cpu cpu-right memory-left memory memory-right filesystem-left filesystem filesystem-right date-left date date-right time-left time time-right dunst-left dunst-status dunst-clear dunst-history-view dunst-history-clear dunst-history-length dunst-right
 
 ; The separator will be inserted between the output of each module
 separator = ""
@@ -312,7 +335,7 @@ tray-maxsize = ${sizes.tray-maxsize}
 ; ARGB color (e.g. #f00, #ff992a, #ddff1023)
 ; By default the tray container will use the bar
 ; background color.
-tray-background = ${colors.background}
+tray-background = ${colors.tray-background}
 
 ; Tray offset defined as pixel value (e.g. 35) or percentage (e.g. 50%)
 tray-offset-x = 0
@@ -365,7 +388,7 @@ cursor-scroll = ns-resize
 
 [module/powermenu-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.powermenu-background}
 content-underline  = ${colors.powermenu-underline}
 content-overline   = ${colors.powermenu-overline}
@@ -373,7 +396,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/powermenu-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.powermenu-background}
 content-underline  = ${colors.powermenu-underline}
 content-overline   = ${colors.powermenu-overline}
@@ -382,7 +405,7 @@ content-padding    = ${sizes.module-padding}
 [module/powermenu]
 type = custom/text
 ; content = " Menu"
-content = ""
+content = "󰀻"
 ; content = ""
 
 ; "content" has the same properties as "format-NAME"
@@ -397,7 +420,7 @@ content-padding    = ${sizes.module-padding}
 ; click-middle = notify-send middle
 ; click-right = notify-send right
 click-left  = "rofi -show combi"
-click-right = "/home/sravan/.scripts/control-center.sh --rofi"
+click-right = "~/.scripts/control-center.sh --rofi"
 
 ; "scroll-(up|down)" will be executed using "/bin/sh -c $COMMAND"
 ; scroll-up = notify-send scroll up
@@ -511,7 +534,7 @@ label-empty-padding    = ${sizes.module-dwm-padding}
 
 [module/media-playing-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.media-playing-background}
 content-underline  = ${colors.media-playing-underline}
 content-overline   = ${colors.media-playing-overline}
@@ -519,7 +542,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/media-playing-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.media-playing-background}
 content-underline  = ${colors.media-playing-underline}
 content-overline   = ${colors.media-playing-overline}
@@ -541,7 +564,7 @@ label-padding    = 1
 
 [module/media-playing-change]
 type = custom/script
-exec = /home/sravan/.config/dwm-flexipatch/polybar/scripts/get-media-source-icon.sh
+exec = ~/.config/dwm-flexipatch/polybar/scripts/get-media-source-icon.sh
 interval = ${intervals.media-playing}
 format = <label>
 label = %output%
@@ -551,24 +574,22 @@ label-underline  = ${colors.media-playing-underline}
 label-overline   = ${colors.media-playing-overline}
 label-maxlen     = ${sizes.maxlen}
 label-padding    = 1
-click-left = "/home/sravan/.scripts/playerctl.sh --change"
+click-left = "~/.scripts/playerctl.sh --change"
 
 [module/media-playing-prev]
-type = custom/script
-exec = echo "󰒮"
-format = <label>
-label = %output%
-label-foreground = ${colors.media-playing-foreground}
-label-background = ${colors.media-playing-background}
-label-underline  = ${colors.media-playing-underline}
-label-overline   = ${colors.media-playing-overline}
-label-maxlen     = ${sizes.maxlen}
-label-padding    = 1
-click-left = "/home/sravan/.scripts/playerctl.sh --prev"
+type = custom/text
+content = "󰒮"
+content-foreground = ${colors.media-playing-foreground}
+content-background = ${colors.media-playing-background}
+content-underline  = ${colors.media-playing-underline}
+content-overline   = ${colors.media-playing-overline}
+content-maxlen     = ${sizes.maxlen}
+content-padding    = 1
+click-left = "~/.scripts/playerctl.sh --prev"
 
 [module/media-playing-play-pause]
 type = custom/script
-exec = /home/sravan/.config/dwm-flexipatch/polybar/scripts/get-media-status-icon.sh
+exec = ~/.config/dwm-flexipatch/polybar/scripts/get-media-status-icon.sh
 format = <label>
 label = %output%
 label-foreground = ${colors.media-playing-foreground}
@@ -577,24 +598,22 @@ label-underline  = ${colors.media-playing-underline}
 label-overline   = ${colors.media-playing-overline}
 label-maxlen     = ${sizes.maxlen}
 label-padding    = 1
-click-left = "/home/sravan/.scripts/playerctl.sh --play-pause"
+click-left = "~/.scripts/playerctl.sh --play-pause"
 
 [module/media-playing-next]
-type = custom/script
-exec = echo "󰒭"
-format = <label>
-label = %output%
-label-foreground = ${colors.media-playing-foreground}
-label-background = ${colors.media-playing-background}
-label-underline  = ${colors.media-playing-underline}
-label-overline   = ${colors.media-playing-overline}
-label-maxlen     = ${sizes.maxlen}
-label-padding    = 1
-click-left = "/home/sravan/.scripts/playerctl.sh --next"
+type = custom/text
+content = "󰒭"
+content-foreground = ${colors.media-playing-foreground}
+content-background = ${colors.media-playing-background}
+content-underline  = ${colors.media-playing-underline}
+content-overline   = ${colors.media-playing-overline}
+content-maxlen     = ${sizes.maxlen}
+content-padding    = 1
+click-left = "~/.scripts/playerctl.sh --next"
 
 [module/date-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.date-background}
 content-underline  = ${colors.date-underline}
 content-overline   = ${colors.date-overline}
@@ -602,7 +621,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/date-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.date-background}
 content-underline  = ${colors.date-underline}
 content-overline   = ${colors.date-overline}
@@ -635,7 +654,7 @@ format = <label>
 ;   %date%
 ;   %time%
 ; Default: %date%
-label = " %date%"
+label = " %date%"
 ; label-font = 3
 label-foreground = ${colors.date-foreground}
 label-background = ${colors.date-background}
@@ -645,7 +664,7 @@ label-padding    = ${sizes.module-padding}
 
 [module/time-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.time-background}
 content-underline  = ${colors.time-underline}
 content-overline   = ${colors.time-overline}
@@ -653,7 +672,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/time-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.time-background}
 content-underline  = ${colors.time-underline}
 content-overline   = ${colors.time-overline}
@@ -696,7 +715,7 @@ label-padding    = ${sizes.module-padding}
 
 [module/kernel-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.kernel-background}
 content-underline  = ${colors.kernel-underline}
 content-overline   = ${colors.kernel-overline}
@@ -704,7 +723,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/kernel-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.kernel-background}
 content-underline  = ${colors.kernel-underline}
 content-overline   = ${colors.kernel-overline}
@@ -734,7 +753,7 @@ interval = ${intervals.kernel}
 ; Available tags:
 ;   <output> - deprecated
 ;   <label> (default)
-format = <label>
+format = %{A1:kitty bash -c "fastfetch && sleep 15":}<label>%{A}
 format-foreground = ${colors.kernel-foreground}
 format-background = ${colors.kernel-background}
 format-underline  = ${colors.kernel-underline}
@@ -766,9 +785,81 @@ label-padding    = ${sizes.module-padding}
 ; scroll-up = echo scroll up %counter%
 ; scroll-down = echo scroll down %counter%
 
+[module/system76-power-left]
+type = custom/text
+content = " "
+content-foreground = ${colors.system76-power-background}
+content-underline  = ${colors.system76-power-underline}
+content-overline   = ${colors.system76-power-overline}
+content-padding    = ${sizes.module-padding}
+
+[module/system76-power-right]
+type = custom/text
+content = " "
+content-foreground = ${colors.system76-power-background}
+content-underline  = ${colors.system76-power-underline}
+content-overline   = ${colors.system76-power-overline}
+content-padding    = ${sizes.module-padding}
+
+[module/system76-power]
+type = custom/script
+
+; Available tokens:
+;   %counter%
+; Command to be executed (using "/bin/sh -c [command]")
+exec = echo "󰢮 $(sudo system76-power graphics)"
+
+; Conditional command that, if defined, needs to exit successfully
+; before the main exec command is invoked.
+; Default: ""
+; exec-if = pgrep -x myservice
+
+; Will the script output continous content?
+; Default: false
+tail = false
+
+; Seconds to sleep between updates
+; Default: 5 (0 if `tail = true`)
+interval = ${intervals.system76-power}
+
+; Available tags:
+;   <output> - deprecated
+;   <label> (default)
+format = <label>
+format-foreground = ${colors.system76-power-foreground}
+format-background = ${colors.system76-power-background}
+format-underline  = ${colors.system76-power-underline}
+format-overline   = ${colors.system76-power-overline}
+
+; Available tokens:
+;   %output%
+; Default: %output%
+label = %output%
+label-padding    = ${sizes.module-padding}
+
+; Available tokens:
+;   %counter%
+;   %pid%
+;
+; "click-(left|middle|right)" will be executed using "/bin/sh -c [command]"
+click-left = nvidia-settings
+; click-middle = echo middle %counter%
+click-right = ~/.scripts/cpu-gpu.sh --rofi
+; double-click-left = echo double left %counter%
+; double-click-middle = echo double middle %counter%
+; double-click-right = echo double right %counter%
+
+; Available tokens:
+;   %counter%
+;   %pid%
+;
+; "scroll-(up|down)" will be executed using "/bin/sh -c [command]"
+; scroll-up = echo scroll up %counter%
+; scroll-down = echo scroll down %counter%
+
 [module/cpu-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.cpu-background}
 content-underline  = ${colors.cpu-underline}
 content-overline   = ${colors.cpu-overline}
@@ -776,7 +867,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/cpu-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.cpu-background}
 content-underline  = ${colors.cpu-underline}
 content-overline   = ${colors.cpu-overline}
@@ -801,7 +892,7 @@ format = %{A1:kitty btop:}<label>%{A}
 ;   %percentage-sum% - Cumulative load on all cores
 ;   %percentage-cores% - load percentage for each core
 ;   %percentage-core[1-9]% - load percentage for specific core
-label =  %percentage%%
+label =  %percentage%%
 label-padding    = ${sizes.module-padding}
 label-foreground = ${colors.cpu-foreground}
 label-background = ${colors.cpu-background}
@@ -822,7 +913,7 @@ ramp-coreload-foreground = ${colors.cpu}
 
 [module/memory-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.memory-background}
 content-underline  = ${colors.memory-underline}
 content-overline   = ${colors.memory-overline}
@@ -830,7 +921,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/memory-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.memory-background}
 content-underline  = ${colors.memory-underline}
 content-overline   = ${colors.memory-overline}
@@ -873,7 +964,7 @@ format = %{A1:kitty btop:}<label>%{A}
 ;   %gb_swap_free%
 ;   %gb_swap_used%
 
-label = 󰍛 %percentage_used%%
+label =   %percentage_used%%
 label-padding    = ${sizes.module-padding}
 label-foreground = ${colors.memory-foreground}
 label-background = ${colors.memory-background}
@@ -915,7 +1006,7 @@ ramp-free-foreground = ${colors.memory}
 
 [module/filesystem-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.filesystem-background}
 content-underline  = ${colors.filesystem-underline}
 content-overline   = ${colors.filesystem-overline}
@@ -923,7 +1014,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/filesystem-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.filesystem-background}
 content-underline  = ${colors.filesystem-underline}
 content-overline   = ${colors.filesystem-overline}
@@ -952,7 +1043,7 @@ spacing = ${sizes.module-margin}
 ;   <bar-free>
 ;   <bar-used>
 ;   <ramp-capacity>
-format-mounted = %{A1:filelight &:}<label-mounted>%{A}
+format-mounted = %{A1:qdirstat &:}<label-mounted>%{A}
 
 ; Available tags:
 ;   <label-unmounted> (default)
@@ -987,7 +1078,7 @@ label-unmounted-padding    = ${sizes.module-padding}
 
 [module/deadd-notification-center-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.deadd-notification-center-background}
 content-underline  = ${colors.deadd-notification-center-underline}
 content-overline   = ${colors.deadd-notification-center-overline}
@@ -995,7 +1086,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/deadd-notification-center-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.deadd-notification-center-background}
 content-underline  = ${colors.deadd-notification-center-underline}
 content-overline   = ${colors.deadd-notification-center-overline}
@@ -1014,9 +1105,118 @@ content-overline   = ${colors.deadd-notification-center-overline}
 content-padding    = ${sizes.module-padding}
 
 ; "click-(left|middle|right)" will be executed using "/bin/sh -c $COMMAND"
-click-left = "/home/sravan/.scripts/deadd.sh --toggle-center"
+click-left = "~/.scripts/deadd.sh --toggle-center"
 ; click-middle = notify-send middle
-click-right = "/home/sravan/.scripts/deadd.sh --rofi"
+click-right = "~/.scripts/deadd.sh --rofi"
+
+; "scroll-(up|down)" will be executed using "/bin/sh -c $COMMAND"
+; scroll-up = notify-send scroll up
+; scroll-down = notify-send scroll down
+
+[module/dunst-left]
+type = custom/text
+content = " "
+content-foreground = ${colors.dunst-background}
+content-underline  = ${colors.dunst-underline}
+content-overline   = ${colors.dunst-overline}
+content-padding    = ${sizes.module-padding}
+
+[module/dunst-right]
+type = custom/text
+content = " "
+content-foreground = ${colors.dunst-background}
+content-underline  = ${colors.dunst-underline}
+content-overline   = ${colors.dunst-overline}
+content-padding    = ${sizes.module-padding}
+
+[module/dunst-status]
+type = custom/script
+exec = ~/.config/dwm-flexipatch/polybar/scripts/dunst-status.sh
+interval = ${intervals.dunst}
+format = <label>
+label = %output%
+label-foreground = ${colors.dunst-foreground}
+label-background = ${colors.dunst-background}
+label-underline  = ${colors.dunst-underline}
+label-overline   = ${colors.dunst-overline}
+label-padding    = ${sizes.module-padding}
+click-left = "~/.scripts/dunst.sh --dnd"
+click-right = "~/.scripts/dunst.sh --rofi"
+
+[module/dunst-clear]
+type = custom/text
+content = ""
+content-foreground = ${colors.dunst-foreground}
+content-background = ${colors.dunst-background}
+content-underline  = ${colors.dunst-underline}
+content-overline   = ${colors.dunst-overline}
+content-padding    = 1
+click-left = "~/.scripts/dunst.sh --close-all"
+
+[module/dunst-history-view]
+type = custom/text
+content = "󰋚"
+content-foreground = ${colors.dunst-foreground}
+content-background = ${colors.dunst-background}
+content-underline  = ${colors.dunst-underline}
+content-overline   = ${colors.dunst-overline}
+content-padding    = 1
+click-left = "~/.scripts/dunst.sh --history"
+
+[module/dunst-history-clear]
+type = custom/text
+content = "󰎟"
+content-foreground = ${colors.dunst-foreground}
+content-background = ${colors.dunst-background}
+content-underline  = ${colors.dunst-underline}
+content-overline   = ${colors.dunst-overline}
+content-padding    = 1
+click-left = "~/.scripts/dunst.sh --history-clear"
+
+[module/dunst-history-length]
+type = custom/script
+exec = "dunstctl count history"
+interval = ${intervals.dunst}
+format = <label>
+label = %output%
+label-foreground = ${colors.dunst-foreground}
+label-background = ${colors.dunst-background}
+label-underline  = ${colors.dunst-underline}
+label-overline   = ${colors.dunst-overline}
+label-padding    = 1
+
+[module/xfce4-notifyd-left]
+type = custom/text
+content = " "
+content-foreground = ${colors.xfce4-notifyd-background}
+content-underline  = ${colors.xfce4-notifyd-underline}
+content-overline   = ${colors.xfce4-notifyd-overline}
+content-padding    = ${sizes.module-padding}
+
+[module/xfce4-notifyd-right]
+type = custom/text
+content = " "
+content-foreground = ${colors.xfce4-notifyd-background}
+content-underline  = ${colors.xfce4-notifyd-underline}
+content-overline   = ${colors.xfce4-notifyd-overline}
+content-padding    = ${sizes.module-padding}
+
+[module/xfce4-notifyd]
+type = custom/text
+content = "󰂚"
+
+; "content" has the same properties as "format-NAME"
+; content-background = #000
+content-foreground = ${colors.xfce4-notifyd-foreground}
+content-background = ${colors.xfce4-notifyd-background}
+content-underline  = ${colors.xfce4-notifyd-underline}
+content-overline   = ${colors.xfce4-notifyd-overline}
+content-padding    = ${sizes.module-padding}
+
+; "click-(left|middle|right)" will be executed using "/bin/sh -c $COMMAND"
+click-left = "~/.scripts/xfce4-notifyd.sh --toggle-center"
+; click-middle = notify-send middle
+click-right = "~/.scripts/xfce4-notifyd.sh --rofi"
 
 ; "scroll-(up|down)" will be executed using "/bin/sh -c $COMMAND"
 ; scroll-up = notify-send scroll up
@@ -1024,7 +1224,7 @@ click-right = "/home/sravan/.scripts/deadd.sh --rofi"
 
 [module/volume-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.volume-background}
 content-underline  = ${colors.volume-underline}
 content-overline   = ${colors.volume-overline}
@@ -1032,7 +1232,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/volume-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.volume-background}
 content-underline  = ${colors.volume-underline}
 content-overline   = ${colors.volume-overline}

polybar/launch.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BAR="mybar"
 CONFIG="~/.config/dwm-flexipatch/polybar/config.ini"
 NUM_MONITORS=0
 CONNECTED_MONITORS=$(xrandr --query | grep " connected" | cut -d" " -f1)
 TRAY_POS="center"
 
-killall -q polybar
+pkill polybar
 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 rm /tmp/polybar.pids

polybar/scripts/dunst-status.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+isPaused=$(dunstctl is-paused)
+
+if [[ "$isPaused" == "true" ]]; then
+    echo "󰂛"
+else
+    echo "󰂚"
+fi

polybar/scripts/get-media-info.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-mediaStatus=$(playerctl --player=playerctld metadata 2>&1)
-
-if [[ "$mediaStatus" == "No player could handle this command" ]]; then
-        echo "  N/A"
-else
-        artist=$(playerctl --player=playerctld metadata --format '{{ artist }}')
-        title=$(playerctl --player=playerctld metadata --format '{{ title }}')
-
-        if [[ $artist == "" ]]; then
-            artist="N/A"
-        fi
-
-        if [[ $title == "" ]]; then
-            title="N/A"
-        fi
-
-        echo "$title - $artist"
-fi

polybar/scripts/get-media-playing.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 mediaStatus=$(playerctl --player=playerctld metadata 2>&1)
 
 if [[ "$mediaStatus" == "No player could handle this command" ]]; then

polybar/scripts/get-media-source-icon.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 mediaStatus=$(playerctl --player=playerctld metadata 2>&1)
 
 if [[ "$mediaStatus" == "No player could handle this command" ]]; then

polybar/scripts/get-media-status-icon.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
-mediaStatus=$(/home/sravan/.config/dwm-flexipatch/polybar/scripts/get-media-status.sh)
+#!/usr/bin/env bash
+mediaStatus=$(~/.config/dwm-flexipatch/polybar/scripts/get-media-status.sh)
 
 if [[ "$mediaStatus" == "N/A" ]]; then
     echo "󰐎"

polybar/scripts/get-media-status.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 mediaStatus=$(playerctl --player=playerctld metadata 2>&1)
 
 if [[ "$mediaStatus" == "No player could handle this command" ]]; then

polybar/scripts/scroll-media-playing.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 zscroll \
     --length $(xrdb -get polybar.maxlen) \
     --delay 0.2 \

polybar/scripts/updates-pacman-aurhelper.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-if ! updates_arch=$(checkupdates 2> /dev/null | wc -l ); then
-    updates_arch=0
-fi
-
-# if ! updates_aur=$(yay -Qum 2> /dev/null | wc -l); then
-if ! updates_aur=$(paru -Qum 2> /dev/null | wc -l); then
-# if ! updates_aur=$(cower -u 2> /dev/null | wc -l); then
-# if ! updates_aur=$(trizen -Su --aur --quiet | wc -l); then
-# if ! updates_aur=$(pikaur -Qua 2> /dev/null | wc -l); then
-# if ! updates_aur=$(rua upgrade --printonly 2> /dev/null | wc -l); then
-    updates_aur=0
-fi
-
-updates=$((updates_arch + updates_aur))
-
-# if [ "$updates" -gt 0 ]; then
-#     echo "# $updates"
-# else
-#     echo ""
-# fi
-
-echo "$updates"