autolinux

commit 36dec471d82560d3fae3ba16d86adfafa6254bf1

Author: Connor Etherington <[email protected]>

Date:   Sun Mar 19 18:47:22 2023 +0200

    Auto-Commit Update 19.03.2023 - 18:47:22

---

 AutoLinux                 | Bin 0 -> 109536 bytes

 AutoLinux.c               |  50 +++++++++++++--------

 AutoLinux.o               | Bin 0 -> 107296 bytes

 Makefile                  |   8 ++--

 config.h                  | 110 ++++++++++++++++++++++++++--------------------

 drw.o                     | Bin 0 -> 10320 bytes

 dwm-attachbottom-6.3.diff |  54 +++++++++++++++++++++++

 patch/bar_time.c          |  44 +++++++++++++++++++

 patch/bar_time.h          |   3 ++

 patch/include.c           |   3 +-

 patch/include.h           |   3 +-

 util.o                    | Bin 0 -> 2224 bytes

 12 files changed, 203 insertions(+), 72 deletions(-)

diff --git a/AutoLinux b/AutoLinux

new file mode 100755

index 0000000..a9a76d1

Binary files /dev/null and b/AutoLinux differ

diff --git a/AutoLinux.c b/AutoLinux.c

index da95f4a..8b9f814 100644

--- a/AutoLinux.c

+++ b/AutoLinux.c

@@ -69,6 +69,7 @@

 #define SPTAGMASK		(((1 << LENGTH(scratchpads))-1) << LENGTH(tags))

 #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)

 #define TRUNC(X,A,B)            (MAX((A), MIN((X), (B))))

+#define currentTime() { .v = (const char*[]){ "/bin/sh", "-c", "date '+%H:%M:%S'", NULL } }

 /* enums */

 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */

@@ -135,8 +136,9 @@ typedef struct {

 	int alignment; // see bar alignment enum

 	int (*widthfunc)(Bar *bar, BarWidthArg *a);

 	int (*drawfunc)(Bar *bar, BarDrawArg *a);

+	int (*timefunc)(Bar *bar, BarDrawArg *a);

 	int (*clickfunc)(Bar *bar, Arg *arg, BarClickArg *a);

-	char *name; // for debugging

+	char *name; // for debugging             //

 	int x, w; // position, width for internal use

 } BarRule;

@@ -231,6 +233,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac

 static void arrange(Monitor *m);

 static void arrangemon(Monitor *m);

 static void attach(Client *c);

+static void attachbottom(Client *c);

 static void attachstack(Client *c);

 static void buttonpress(XEvent *e);

 static void checkotherwm(void);

@@ -301,8 +304,8 @@ static void seturgent(Client *c, int urg);

 static void showhide(Client *c);

 static void sigchld(int unused);

 #ifndef __OpenBSD__

-static int getAutoLinuxblockspid();

-static void sigAutoLinuxblocks(const Arg *arg);

+static int getdwmblockspid();

+static void sigdwmblocks(const Arg *arg);

 #endif

 static void sighup(int unused);

 static void sigterm(int unused);

@@ -355,8 +358,8 @@ static pid_t winpid(Window w);

 static const char broken[] = "broken";

 static char stext[256];

 static char rawstext[256];

-static int AutoLinuxblockssig;

-pid_t AutoLinuxblockspid = 0;

+static int dwmblockssig;

+pid_t dwmblockspid = 0;

 static int screen;

 static int sw, sh;           /* X display screen geometry width, height */

 static int bh;               /* bar geometry */

@@ -545,6 +548,15 @@ attach(Client *c)

 	c->mon->clients = c;

 }

+void

+attachbottom(Client *c)

+{

+	Client **tc;

+	c->next = NULL;

+	for (tc = &c->mon->clients; *tc; tc = &(*tc)->next);

+	*tc = c;

+}

+

 void

 attachstack(Client *c)

 {

@@ -1182,14 +1194,14 @@ getatomprop(Client *c, Atom prop)

 #ifndef __OpenBSD__

 int

-getAutoLinuxblockspid()

+getdwmblockspid()

 {

 	char buf[16];

-	FILE *fp = popen("pidof -s AutoLinuxblocks", "r");

+	FILE *fp = popen("pidof -s dwmblocks", "r");

 	fgets(buf, sizeof(buf), fp);

 	pid_t pid = strtoul(buf, NULL, 10);

 	pclose(fp);

-	AutoLinuxblockspid = pid;

+	dwmblockspid = pid;

 	return pid != 0 ? 0 : -1;

 }

 #endif

@@ -1389,7 +1401,7 @@ manage(Window w, XWindowAttributes *wa)

 		c->isfloating = c->oldstate = trans != None || c->isfixed;

 	if (c->isfloating)

 		XRaiseWindow(dpy, c->win);

-	attach(c);

+	attachbottom(c);

 	attachstack(c);

 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,

 		(unsigned char *) &(c->win), 1);

@@ -1736,7 +1748,7 @@ run(void)

 void

 runAutostart(void) {

-	system("killall -q AutoLinuxblocks; AutoLinuxblocks &");

+	system("killall -q dwmblocks; dwmblocks &");

 }

 void

@@ -1868,7 +1880,7 @@ sendmon(Client *c, Monitor *m)

 	detachstack(c);

 	c->mon = m;

 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */

-	attach(c);

+	attachbottom(c);

 	attachstack(c);

 	focus(NULL);

 	arrange(NULL);

@@ -2144,18 +2156,18 @@ sigterm(int unused)

 #ifndef __OpenBSD__

 void

-sigAutoLinuxblocks(const Arg *arg)

+sigdwmblocks(const Arg *arg)

 {

 	union sigval sv;

-	sv.sival_int = 0 | (AutoLinuxblockssig << 8) | arg->i;

-	if (!AutoLinuxblockspid)

-		if (getAutoLinuxblockspid() == -1)

+	sv.sival_int = 0 | (dwmblockssig << 8) | arg->i;

+	if (!dwmblockspid)

+		if (getdwmblockspid() == -1)

 			return;

-	if (sigqueue(AutoLinuxblockspid, SIGUSR1, sv) == -1) {

+	if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) {

 		if (errno == ESRCH) {

-			if (!getAutoLinuxblockspid())

-				sigqueue(AutoLinuxblockspid, SIGUSR1, sv);

+			if (!getdwmblockspid())

+				sigqueue(dwmblockspid, SIGUSR1, sv);

 		}

 	}

 }

@@ -2490,7 +2502,7 @@ updategeom(void)

 					m->clients = c->next;

 					detachstack(c);

 					c->mon = mons;

-					attach(c);

+					attachbottom(c);

 					attachstack(c);

 				}

 				if (m == selmon)

diff --git a/AutoLinux.o b/AutoLinux.o

new file mode 100644

index 0000000..7c77353

Binary files /dev/null and b/AutoLinux.o differ

diff --git a/Makefile b/Makefile

index 8a7c29b..7ece6df 100644

--- a/Makefile

+++ b/Makefile

@@ -37,13 +37,13 @@ install: all

 	cp -f AutoLinux ${DESTDIR}${PREFIX}/bin

 	chmod 755 ${DESTDIR}${PREFIX}/bin/AutoLinux

 	mkdir -p ${DESTDIR}${PREFIX}/share/xsessions

-	mkdir -p ${DESTDIR}${PREFIX}/share/licenses/auto-AutoLinux

-	sudo cp -f LICENSE ${DESTDIR}${PREFIX}/share/licenses/auto-AutoLinux

+	mkdir -p ${DESTDIR}${PREFIX}/share/licenses/AutoLinux

+	sudo cp -f LICENSE ${DESTDIR}${PREFIX}/share/licenses/AutoLinux

 	sudo cp -f AutoLinux.desktop ${DESTDIR}${PREFIX}/share/xsessions

-	

+

 uninstall:

 	rm -f ${DESTDIR}${PREFIX}/bin/AutoLinux\

 		${DESTDIR}${PREFIX}/share/xsessions/AutoLinux.desktop\

-		${DESTDIR}${PREFIX}/share/licenses/auto-AutoLinux/LICENSE

+		${DESTDIR}${PREFIX}/share/licenses/AutoLinux/LICENSE

 .PHONY: all options clean dist install uninstall

diff --git a/config.h b/config.h

index 15b20fc..799af40 100644

--- a/config.h

+++ b/config.h

@@ -8,6 +8,12 @@

 #define TERMCLASS "St"

 #define TERMINAL2 "alacritty"

 #define TERMCLASS2 "Alacritty"

+#define MODKEY Mod4Mask

+#define ALTKEY Mod1Mask

+#define CTRLKEY ControlMask

+#define NOMOD 0

+

+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }

 //--------------------------------------------------------- Appearance ---------------------------------------------------------//

@@ -18,7 +24,7 @@ static unsigned int gappih          = 8;              /* horiz inner gap between

 static unsigned int gappiv          = 8;              /* vert inner gap between windows */

 static unsigned int gappoh          = 12;             /* horiz outer gap between windows and screen edge */

 static unsigned int gappov          = 12;             /* vert outer gap between windows and screen edge */

-static int user_bh                  = 35;              /* 0 means that AutoLinux will calculate bar height, >= 1 means AutoLinux will user_bh as bar height */

+static int user_bh                  = 30;              /* 0 means that AutoLinux will calculate bar height, >= 1 means AutoLinux will user_bh as bar height */

 static int swallowfloating          = 5;              /* 5 means swallow floating windows by default */

 static int smartgaps                = 0;              /* 1 means no outer gap when there is only one window */

 static int showbar                  = 1;              /* 0 means no bar */

@@ -77,7 +83,6 @@ static const char *tags[] =   { " 1 ", " 2 ", " 3 ", " 4 ", "  ", " 6 ", " 7

 // static const char *tags[] =  {  " ", " ", " ", " ", " ", " ", " ", " ", " "  };

-

 static const Rule rules[] = {

 	/* xprop(1):

 	 *	WM_CLASS(STRING) = instance, class

@@ -98,9 +103,9 @@ static const BarRule barrules[] = {

    	/* monitor  bar    alignment             widthfunc              drawfunc              clickfunc           name */

  /* { -1,       0,     BAR_ALIGN_LEFT,       width_tags,            draw_tags,            click_tags,         "tags"     }, */

     { -1,       0,     BAR_ALIGN_LEFT,       width_ltsymbol,        draw_ltsymbol,        click_ltsymbol,     "layout"   },

+    { -1,       0,     BAR_ALIGN_RIGHT,      width_time,            draw_time,            click_time,         "time"     },

   	{ -1,       0,     BAR_ALIGN_CENTER,     width_tags,            draw_tags,            click_tags,         "tags"     },

- /* { -1,       0,     BAR_ALIGN_RIGHT,      width_status,          draw_status,          click_status,       "status"   }, */

- /* { -1,       0,     BAR_ALIGN_NONE,       width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" }, */

+    { 0,        0,     BAR_ALIGN_NONE,       width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" },

 };

@@ -114,28 +119,24 @@ static int resizehints = 0;    /* 1 means respect size hints in tiled resizals *

 static const Layout layouts[] = {

 	/* symbol     arrange function */

 	{ "[]=",	monocle },			/* Default: Master on left, slaves on right */

-	{ "TTT",	bstack },		/* Master on top, slaves on bottom */

+	{ "",	bstack },		/* Master on top, slaves on bottom */

 /*	{ "[@]",	spiral },		 Fibonacci spiral */

 /*	{ "[\\]",	dwindle },		 Decreasing in size right and leftward */

-	{ "[D]",	deck },			/* Master on left, slaves in monocle-like mode on right */

-	{ "[T]",	tile },		/* All windows on top of eachother */

+	{ "",	deck },			/* Master on left, slaves in monocle-like mode on right */

+	{ "",	tile },		/* All windows on top of eachother */

-	{ "|M|",	centeredmaster },		/* Master in middle, slaves on sides */

-	{ ">M>",	centeredfloatingmaster },	/* Same but master floats */

+	{ "",	centeredmaster },		/* Master in middle, slaves on sides */

+	{ "",	centeredfloatingmaster },	/* Same but master floats */

-	{ "><>",	NULL },			/* no layout function means floating behavior */

-	{ NULL,		NULL },

+	{ "",	NULL },			/* no layout function means floating behavior */

+	{ "",		NULL },

 };

-

 //--------------------------------------------------------- Key Definitions -----------------------------------------------------//

-#define MODKEY Mod4Mask

-#define ALTKEY Mod1Mask

-#define CTRLKEY ControlMask

 #define TAGKEYS(KEY,         TAG) \

 	{ MODKEY,                       KEY,               view,           {.ui = 1 << TAG} }, \

@@ -146,9 +147,9 @@ static const Layout layouts[] = {

 #define STACKKEYS(MOD,ACTION) \

 	{ MOD,	XK_j,	        ACTION##stack,	{.i = INC(+1) } }, \

 	{ MOD,	XK_k,	        ACTION##stack,	{.i = INC(-1) } }, \

-	{ MOD,  XK_v,         ACTION##stack,  {.i = 0 } }, \

 	{ MOD,  XK_BackSpace, ACTION##stack, {.i = PREVSEL } }, \

   { MOD,  XK_Escape,    ACTION##stack,  {.i = 0 } }, \

+  { MOD,  XK_comma,    ACTION##stack,  {.i = 0 } }, \

 	{ MOD,  XK_Up,	    ACTION##stack,	{.i = INC(+1) } }, \

 	{ MOD,  XK_Down,	ACTION##stack,	{.i = INC(-1) } }, \

 	/* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */

@@ -157,13 +158,13 @@ static const Layout layouts[] = {

 	/* { MOD, XK_x,     ACTION##stack, {.i = -1 } }, */

 /* helper for spawning shell commands in the pre AutoLinux-5.0 fashion */

-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }

 /* commands */

 static const char *termcmd[]   = { TERMINAL,  NULL };

 static const char *term2cmd[]   = { TERMINAL2,  NULL };

+

 //------------------------------------------  Xresources preferences to load at startup  ----------------------------------------//

 ResourcePref resources[] = {

@@ -209,19 +210,33 @@ static Key keys[] = {

 	TAGKEYS(			XK_6,		5)

 	TAGKEYS(			XK_7,		6)

 	TAGKEYS(			XK_8,		7)

-	TAGKEYS(			XK_9,		8)

-	{ MODKEY,         			XK_0,		view,		{.ui = ~0 } },

+	TAGKEYS(  		XK_9,		8)

+

+  { MODKEY,             XK_F12,     spawn,		SHCMD("cpSecPass 1") },

+  { MODKEY,             XK_F11,     spawn,		SHCMD("cpSecPass 2") },

+  { MODKEY,             XK_F6,      spawn,		SHCMD("cpSecPass 3") },

+  { MODKEY,             XK_F7,      spawn,		SHCMD("cpSecPass 4") },

+  { MODKEY,             XK_F9,      spawn,		SHCMD("cpSecPass 5") },

+  { MODKEY,             XK_F10,     spawn,		SHCMD("cpSecPass 6") },

+  { ALTKEY|ShiftMask,   XK_F10,     spawn,		SHCMD("clipmenu") },

+  { MODKEY,             XK_F8,      spawn,		SHCMD("cpSecPass 7") },

+  { MODKEY,             XK_minus,	  spawn,		SHCMD("cpSecPass 8") },

+  { MODKEY,             XK_equal,	  spawn,		SHCMD("cpSecPass 9") },

+  { MODKEY,             XK_F13,     spawn,		SHCMD("cpSecPass 10") },

+

+  { MODKEY,         			XK_0,		view,		{.ui = ~0 } },

 	{ MODKEY|ShiftMask,		XK_0,		tag,		{.ui = ~0 } },

-	{ MODKEY,         			XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof AutoLinuxblocks)") },

-	{ MODKEY|ShiftMask,		XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof AutoLinuxblocks)") },

-	{ MODKEY,         			XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof AutoLinuxblocks)") },

-	{ MODKEY|ShiftMask,		XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof AutoLinuxblocks)") },

+	{ MODKEY,         			XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") },

+//	{ MODKEY|ShiftMask,		XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") },

+ // { MODKEY,         			XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") },

+	{ MODKEY|ShiftMask,		XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") },

 	{ MODKEY,         			XK_BackSpace,	spawn,		SHCMD("sysact") },

 	{ MODKEY|ShiftMask,		XK_BackSpace,	spawn,		SHCMD("sysact") },

 	{ MODKEY,		XK_s,	 togglescratch, {.ui = 0 } },

 	{ ALTKEY,		XK_Return,  togglescratch, {.ui = 1 } },

 	{ MODKEY|ShiftMask,		XK_a,	 togglescratch, {.ui = 2 } },

+	{ MODKEY|ControlMask, XK_period,  spawn, SHCMD(TERMINAL " -e job") },

 /*  { MODKEY|ShiftMask,        XK_a, scratchpad_show, {0} },

 	{ MODKEY|ShiftMask,        XK_s, scratchpad_hide, {0} },

@@ -234,12 +249,13 @@ static Key keys[] = {

 	{ MODKEY,         			XK_w,		spawn,		SHCMD("$BROWSER") },

 	{ MODKEY|ShiftMask,	XK_w,		spawn,		SHCMD("$BROWSER2") },

   { MODKEY,                	XK_c,		spawn,		SHCMD("clipdl") },

-  { MODKEY|ShiftMask,       XK_c,		spawn,		SHCMD(TERMINAL " -e tdap") },

+  { MODKEY|ShiftMask,       XK_c,		spawn,		SHCMD(TERMINAL2 " -e tdap") },

+  { CTRLKEY|ShiftMask,     XK_c,		spawn,		SHCMD("xdotool type '[email protected]'") },

 /*	{ MODKEYask,		XK_w,		spawn,		SHCMD(TERMINAL " -e sudo nmtui") }, */

-	{ MODKEY,         		XK_e,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 AutoLinuxblocks; rmdir ~/.abook") },

+	{ MODKEY,         		XK_e,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },

 	{ MODKEY|ShiftMask,		XK_e,		spawn,		SHCMD("rofi -modi emoji -show emoji") },

-	{ MODKEY,         		XK_r,		spawn,		SHCMD(TERMINAL " -e htop") },

+	{ MODKEY,         		XK_r,		spawn,		SHCMD(TERMINAL " -e gifcast -w -o ~/Media/SCREEN-REC/`dt - -t :`.mp4") },

 	{ MODKEY|ShiftMask,		XK_r,		spawn,		SHCMD(TERMINAL " -e htop") },

 	{ ALTKEY,         		XK_y,	  spawn,     SHCMD("youtube-music") },

 	{ MODKEY,         		XK_t,		setlayout,	{.v = &layouts[0]} }, /* tile */

@@ -266,7 +282,7 @@ static Key keys[] = {

 	{ MODKEY,         			XK_a,		togglegaps,	{0} },

 	{ MODKEY|ShiftMask,     XK_a,		defaultgaps,	{0} },

 //	{ MODKEY,         			XK_s,		togglesticky,	{0} },

-  { MODKEY|ShiftMask,		XK_s,		spawn,     SHCMD("spectacle") },

+  { MODKEY|ShiftMask,		XK_s,		spawn,     SHCMD("gnome-screenshot -i") },

 	{ MODKEY,         			XK_d,		spawn,          SHCMD("rofi -show run") },

 	{ MODKEY|ALTKEY,         			XK_d,		spawn,  SHCMD("rofi -show run") },

 	{ MODKEY|ALTKEY,         		  XK_b,		spawn,		SHCMD("passmenu") },

@@ -304,7 +320,7 @@ static Key keys[] = {

 	{ MODKEY|ShiftMask,     XK_m,		spawn,		SHCMD(TERMINAL " -e mpv `xclip -selection primary -o`") },

 	{ MODKEY,         			XK_comma,	spawn,		SHCMD("mpc prev") },

 	{ MODKEY|ShiftMask,     XK_comma,	spawn,		SHCMD("mpc seek 0%") },

-	{ MODKEY,         			XK_period,	spawn,		SHCMD(TERMINAL " -e qcopy") },

+	{ MODKEY,         			XK_period,	spawn,		SHCMD(TERMINAL2 " -e qcopy -w") },

 	{ MODKEY|ShiftMask,     XK_period,	spawn,		SHCMD("mpc repeat") },

 	{ MODKEY,         			XK_Left,	focusmon,	{.i = -1 } },

@@ -320,15 +336,15 @@ static Key keys[] = {

 	{ MODKEY,         			XK_F2,		spawn,		SHCMD("flameshot gui") },

 	{ MODKEY,         			XK_F3,		spawn,		SHCMD("displayselect") },

-	{ MODKEY,         			XK_F4,		spawn,		SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof AutoLinuxblocks)") },

+	{ MODKEY,         			XK_F4,		spawn,		SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },

   { MODKEY,         		  XK_F5,		spawn,		SHCMD("pavucontrol") },

-	{ MODKEY,         			XK_F6,		spawn,		SHCMD("torwrap") },

-	{ MODKEY,         			XK_F7,		spawn,		SHCMD("td-toggle") },

-	{ MODKEY,         			XK_F8,		spawn,		SHCMD("mw -Y") },

-	{ MODKEY,         			XK_F9,		spawn,		SHCMD("/usr/bin/st -e 'vfzf $custDir'") },

-	{ MODKEY,         			XK_F10,		spawn,		SHCMD(TERMINAL " -e [ ! -d ${custDir} ] && mkdir ${custDir} >/dev/null 2>&1; ${TERMINAL} -e nvim ${custDir}/`find $HOME/CONCISE/repos -type f|sed 's/^.\//'|fzfp`)") },

-  { MODKEY,         			XK_F11,		spawn,		SHCMD("mpv --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },

-	{ MODKEY,         			XK_F12,		spawn,		SHCMD(TERMINAL " -e [ ! -d ${HOME}/SCRATCH ] && mkdir ${HOME}/SCRATCH >/dev/null 2>&1; ${TERMINAL} -e /usr/bin/lfp ${HOME}/SCRATCH") },

+//	{ MODKEY,         			XK_F6,		spawn,		SHCMD("torwrap") },

+//	{ MODKEY,         			XK_F7,		spawn,		SHCMD("td-toggle") },

+//	{ MODKEY,         			XK_F8,		spawn,		SHCMD("mw -Y") },

+//	{ MODKEY,         			XK_F9,		spawn,		SHCMD("/usr/bin/st -e 'vfzf $custDir'") },

+//	{ MODKEY,         			XK_F10,		spawn,		SHCMD(TERMINAL " -e [ ! -d ${custDir} ] && mkdir ${custDir} >/dev/null 2>&1; ${TERMINAL} -e nvim ${custDir}/`find $HOME/CONCISE/repos -type f|sed 's/^.\//'|fzfp`)") },

+//  { MODKEY,         			XK_F11,		spawn,		SHCMD("mpv --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },

+	//{ MODKEY,         			XK_F12,		spawn,		SHCMD(TERMINAL " -e [ ! -d ${HOME}/SCRATCH ] && mkdir ${HOME}/SCRATCH >/dev/null 2>&1; ${TERMINAL} -e /usr/bin/lfp ${HOME}/SCRATCH") },

 	{ MODKEY,         	    XK_slash,	defaultgaps,	{0} },

 	{ MODKEY,                	XK_space,	spawn,	    SHCMD(TERMINAL " -e /usr/bin/snip") },

 	{ MODKEY|ShiftMask,	XK_space,	zoom,	        {0} },

@@ -341,9 +357,9 @@ static Key keys[] = {

 	{ MODKEY,         			XK_Delete,	spawn,		SHCMD("dmenurecord kill") },

 	{ MODKEY,         			XK_Scroll_Lock,	spawn,		SHCMD("killall screenkey || screenkey &") },

-	{ 0, XF86XK_AudioMute,		spawn,		SHCMD("pamixer -t; kill -44 $(pidof AutoLinuxblocks)") },

-	{ 0, XF86XK_AudioRaiseVolume,	spawn,		SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof AutoLinuxblocks)") },

-	{ 0, XF86XK_AudioLowerVolume,	spawn,		SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof AutoLinuxblocks)") },

+	{ 0, XF86XK_AudioMute,		spawn,		SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },

+	{ 0, XF86XK_AudioRaiseVolume,	spawn,		SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)") },

+	{ 0, XF86XK_AudioLowerVolume,	spawn,		SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)") },

 	{ 0, XF86XK_AudioPrev,		spawn,		SHCMD("mpc prev") },

 	{ 0, XF86XK_AudioNext,		spawn,		SHCMD("mpc next") },

 	{ 0, XF86XK_AudioPause,		spawn,		SHCMD("mpc pause") },

@@ -360,7 +376,7 @@ static Key keys[] = {

 	{ 0, XF86XK_DOS,		spawn,		SHCMD(TERMINAL) },

 	{ 0, XF86XK_ScreenSaver,	spawn,		SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },

 	{ 0, XF86XK_TaskPane,		spawn,		SHCMD(TERMINAL " -e htop") },

-	{ 0, XF86XK_Mail,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 AutoLinuxblocks") },

+	{ 0, XF86XK_Mail,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },

 	{ 0, XF86XK_MyComputer,		spawn,		SHCMD(TERMINAL " -e lf /") },

 	/* { 0, XF86XK_Battery,		spawn,		SHCMD("") }, */

 	{ 0, XF86XK_Launch1,		spawn,		SHCMD("xset dpms force off") },

@@ -394,14 +410,14 @@ static Button buttons[] = {

 	/* click                event mask      button          function        argument */

 #ifndef __OpenBSD__

 	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },

-	{ ClkStatusText,        0,              Button1,        sigAutoLinuxblocks,   {.i = 1} },

-	{ ClkStatusText,        0,              Button2,        sigAutoLinuxblocks,   {.i = 2} },

-	{ ClkStatusText,        0,              Button3,        sigAutoLinuxblocks,   {.i = 3} },

-	{ ClkStatusText,        0,              Button4,        sigAutoLinuxblocks,   {.i = 4} },

-	{ ClkStatusText,        0,              Button5,        sigAutoLinuxblocks,   {.i = 5} },

-	{ ClkStatusText,        ShiftMask,      Button1,        sigAutoLinuxblocks,   {.i = 6} },

+	{ ClkStatusText,        0,              Button1,        sigdwmblocks,   {.i = 1} },

+	{ ClkStatusText,        0,              Button2,        sigdwmblocks,   {.i = 2} },

+	{ ClkStatusText,        0,              Button3,        sigdwmblocks,   {.i = 3} },

+	{ ClkStatusText,        0,              Button4,        sigdwmblocks,   {.i = 4} },

+	{ ClkStatusText,        0,              Button5,        sigdwmblocks,   {.i = 5} },

+	{ ClkStatusText,        ShiftMask,      Button1,        sigdwmblocks,   {.i = 6} },

 #endif

-	{ ClkStatusText,        ShiftMask,      Button3,        spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/AutoLinuxblocks/config.h") },

+	{ ClkStatusText,        ShiftMask,      Button3,        spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/dwmblocks/config.h") },

 	{ ClkClientWin,         MODKEY,                  Button1,        movemouse,      {0} },

 	{ ClkClientWin,         MODKEY,                  Button2,        defaultgaps,	{0} },

 	{ ClkClientWin,         MODKEY,                  Button3,        resizemouse,    {0} },

diff --git a/drw.o b/drw.o

new file mode 100644

index 0000000..8c310c9

Binary files /dev/null and b/drw.o differ

diff --git a/dwm-attachbottom-6.3.diff b/dwm-attachbottom-6.3.diff

new file mode 100644

index 0000000..1f3c230

--- /dev/null

+++ b/dwm-attachbottom-6.3.diff

@@ -0,0 +1,54 @@

+diff -up AutoLinux-6.3/AutoLinux.c AutoLinux-6.3-attachbottom/AutoLinux.c

+--- AutoLinux-6.3/AutoLinux.c	2022-01-07 12:42:18.000000000 +0100

++++ AutoLinux-6.3-attachbottom/AutoLinux.c	2022-08-17 22:14:41.813809073 +0200

+@@ -147,6 +147,7 @@ static int applysizehints(Client *c, int

+ static void arrange(Monitor *m);

+ static void arrangemon(Monitor *m);

+ static void attach(Client *c);

++static void attachbottom(Client *c);

+ static void attachstack(Client *c);

+ static void buttonpress(XEvent *e);

+ static void checkotherwm(void);

+@@ -408,6 +409,15 @@ attach(Client *c)

+ }

+

+ void

++attachbottom(Client *c)

++{

++	Client **tc;

++	c->next = NULL;

++	for (tc = &c->mon->clients; *tc; tc = &(*tc)->next);

++	*tc = c;

++}

++

++void

+ attachstack(Client *c)

+ {

+ 	c->snext = c->mon->stack;

+@@ -1066,7 +1076,7 @@ manage(Window w, XWindowAttributes *wa)

+ 		c->isfloating = c->oldstate = trans != None || c->isfixed;

+ 	if (c->isfloating)

+ 		XRaiseWindow(dpy, c->win);

+-	attach(c);

++	attachbottom(c);

+ 	attachstack(c);

+ 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,

+ 		(unsigned char *) &(c->win), 1);

+@@ -1421,7 +1431,7 @@ sendmon(Client *c, Monitor *m)

+ 	detachstack(c);

+ 	c->mon = m;

+ 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */

+-	attach(c);

++	attachbottom(c);

+ 	attachstack(c);

+ 	focus(NULL);

+ 	arrange(NULL);

+@@ -1903,7 +1913,7 @@ updategeom(void)

+ 					m->clients = c->next;

+ 					detachstack(c);

+ 					c->mon = mons;

+-					attach(c);

++					attachbottom(c);

+ 					attachstack(c);

+ 				}

+ 				if (m == selmon)

diff --git a/patch/bar_time.c b/patch/bar_time.c

new file mode 100644

index 0000000..6e86da4

--- /dev/null

+++ b/patch/bar_time.c

@@ -0,0 +1,44 @@

+

+#define SH(cmd) (const char*[]){ "/bin/sh", "-c", cmd, NULL }

+

+// get current time once a second

+void get_time(char *time) {

+    FILE *fp;

+    char buf[100];

+    fp = popen("date +%H:%M", "r");

+    fgets(buf, 100, fp);

+    pclose(fp);

+    strcpy(time, buf);

+}

+

+

+int

+width_time(Bar *bar, BarWidthArg *a)

+{

+  return TEXTW("00:00:00") + lrpad;

+}

+

+int

+draw_time(Bar *bar, BarDrawArg *a)

+{

+	int boxs = drw->fonts->h / 9;

+	int boxw = drw->fonts->h / 6 + 2;

+	int x = a->x, w = a->w;

+	Monitor *m = bar->mon;

+

+	drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);

+

+  char time[100];

+  get_time(time);

+  char *time2 = time;

+  time2[5] = '\0';

+

+  return drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, time2, 0);

+}

+

+int

+click_time(Bar *bar, Arg *arg, BarClickArg *a)

+{

+  return ClkStatusText;

+}

+

diff --git a/patch/bar_time.h b/patch/bar_time.h

new file mode 100644

index 0000000..8fd9f76

--- /dev/null

+++ b/patch/bar_time.h

@@ -0,0 +1,3 @@

+static int width_time(Bar *bar, BarWidthArg *a);

+static int draw_time(Bar *bar, BarDrawArg *a);

+static int click_time(Bar *bar, Arg *arg, BarClickArg *a);

diff --git a/patch/include.c b/patch/include.c

index d422f56..b17bd3e 100644

--- a/patch/include.c

+++ b/patch/include.c

@@ -1,5 +1,6 @@

 /* Bar functionality */

 #include "bar_ltsymbol.c"

+#include "bar_time.c"

 #include "bar_status.c"

 #include "bar_tags.c"

-#include "bar_wintitle.c"

+#include "bar_wintitle.c"

diff --git a/patch/include.h b/patch/include.h

index 5f9a3fe..0fed3fd 100644

--- a/patch/include.h

+++ b/patch/include.h

@@ -1,5 +1,6 @@

 /* Bar functionality */

 #include "bar_ltsymbol.h"

+#include "bar_time.h"

 #include "bar_status.h"

 #include "bar_tags.h"

-#include "bar_wintitle.h"

+#include "bar_wintitle.h"

diff --git a/util.o b/util.o

new file mode 100644

index 0000000..a36344b

Binary files /dev/null and b/util.o differ