added stuff:

1 files changed, 29 insertions, 27 deletions

diff --git a/dwm-6.3/config.h b/dwm-6.3/config.h
index bfd6e8d..a2cc043 100644
--- a/dwm-6.3/config.h
+++ b/dwm-6.3/config.h
@@ -1,4 +1,5 @@
 #include "../colors.h"
+#include "cmd.h"
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
@@ -12,7 +13,7 @@ static const unsigned int gappiv    = 10;
 static const unsigned int gappoh    = 10;
 static const unsigned int gappov    = 10;
 static int smartgaps		    = 0;
-static const char *fonts[]          = { "Source Code Pro:size=9" , "Twitter Color Emoji:size=8"};
+static const char *fonts[]          = { "Source Code Pro:size=9" , "NotoColorEmoji:size=8"};
 static const char dmenufont[]       = "Source Code Pro:size=9";
 static const unsigned int baralpha = 0xd0;
 static const unsigned int borderalpha = OPAQUE;
@@ -28,9 +29,10 @@ static const unsigned int alphas[][3]      = {
 };
 
 static const char *const autostart[] = {
-	"picom", NULL,
-	"fehbg", NULL,
+	"xsetroot", "-name", "Loading dwmblocks", NULL,
 	"dwmblocks", NULL,
+	"fehbg", NULL,
+	"picom", NULL,
 	NULL /* terminate */
 };
 
@@ -46,6 +48,7 @@ static const Rule rules[] = {
 	{ "Gimp",    NULL,     NULL,           0,         1,          0,           0,        -1 },
 	{ "Firefox", NULL,     NULL,           1 << 8,    0,          0,          -1,        -1 },
 	{ "st",      NULL,     NULL,           0,         0,          1,           0,        -1 },
+	{ "Galculator", NULL, NULL,	       0,	  1,	      0,           0,        -1},
 	{ NULL,      NULL,     "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 };
 
@@ -60,7 +63,7 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen win
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
+	{ "[T]",      tile },    /* first entry is default */
 	{ "[M]",      monocle },
 	{ "[@]",      spiral },
 	{ "[\\]",     dwindle },
@@ -77,6 +80,12 @@ static const Layout layouts[] = {
 	{ NULL,       NULL },
 };
 
+#define STATUSBAR "dwmblocks"
+
+/* commands */
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *termcmd[]  = { "st", NULL };
 /* key definitions */
 #define MODKEY Mod1Mask
 #define TAGKEYS(KEY,TAG) \
@@ -85,20 +94,10 @@ static const Layout layouts[] = {
 	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
 
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/bash", "-c", cmd, NULL } }
-
-#define STATUSBAR "dwmblocks"
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-static const char *termcmd[]  = { "st", NULL };
-
 static Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
-	{ MODKEY,             XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY, 		        XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
@@ -106,9 +105,9 @@ static Key keys[] = {
 	{ MODKEY,                       XK_u,      incnmaster,     {.i = -1 } },
 	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
 	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY|ShiftMask,                       XK_Return, zoom,           {0} },
+	{ MODKEY|ShiftMask,             XK_Return, zoom,           {0} },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY,             XK_x,      killclient,     {0} },
+	{ MODKEY,             		XK_x,      killclient,     {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
 	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
@@ -123,16 +122,20 @@ static Key keys[] = {
 	{ MODKEY,			XK_r,	   spawn,	   SHCMD("mpvopen") },
 	{ MODKEY,			XK_F3,	   spawn,	   SHCMD("st ranger") },
 	{ MODKEY,			XK_F5,     spawn,          SHCMD("st ncmpcpp") },
-	{ MODKEY|ShiftMask,		XK_f,	   spawn,	   SHCMD("chromium-ungoogled") },
+	{ MODKEY|ShiftMask,		XK_f,	   spawn,	   SHCMD("firejail --noprofile --hosts-file=~/.config/surf/ads.txt tabbed surf -e") },
 	{ MODKEY,			XK_w,	   spawn,          SHCMD("get_weather") },
-	{ MODKEY,			XK_F11,	   spawn,          SHCMD("dwm-vol_up") },
-	{ MODKEY,			XK_F10,    spawn,          SHCMD("dwm-vol_down") },
-	{ MODKEY,			XK_F7,     spawn,          SHCMD("mpc toggle") },
-	{ MODKEY,			XK_F8,	   spawn,          SHCMD("mpc prev") },
-	{ MODKEY,			XK_F6,	   spawn,          SHCMD("mpc next") },
-	{ MODKEY,			XK_F9,     spawn,          SHCMD("pamixer -t") },
-	{ MODKEY,			XK_p,     spawn,	   SHCMD("sxiv -t ~/Pictures") },
-	{ MODKEY,			XK_a,      spawn, 	   SHCMD("passmenu2") },
+	{ MODKEY,			XK_F11,	   spawn,          SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") },
+	{ MODKEY,			XK_F10,    spawn,          SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") },
+	{ MODKEY,			XK_F7,     spawn,          BASHCMD("mpc toggle") },
+	{ MODKEY,			XK_F8,	   spawn,          BASHCMD("mpc prev") },
+	{ MODKEY,			XK_F6,	   spawn,          BASHCMD("mpc next") },
+	{ MODKEY,			XK_F9,     spawn,          BASHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
+	{ MODKEY,			XK_F1,	   spawn,	   SHCMD("xbacklight -dec 5; kill -44 $(pidof dwmblocks)") },
+	{ MODKEY,			XK_F2,     spawn,	   SHCMD("xbacklight -inc 5; kill -44 $(pidof dwmblocks)") },
+	{ MODKEY,			XK_p,      spawn,	   SHCMD("sxiv -t ~/Pictures") },
+	{ MODKEY,			XK_a,      spawn, 	   BASHCMD("passmenu") },
+	{ MODKEY,			XK_F12,    spawn,	   SHCMD("power") },
+	{ MODKEY,			XK_F4,	   spawn,	   SHCMD("galculator") },
 	{ MODKEY,			XK_e,	   spawn,	   SHCMD("dmenuunicode") },
 	TAGKEYS(                        XK_1,                      0)
 	TAGKEYS(                        XK_2,                      1)
@@ -166,4 +169,3 @@ static Button buttons[] = {
 	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
 	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
 };
-