autolinux


Logs | Files | README | LICENSE | GitLab


1
commit 3fdbfb04aecbdb2d91ee9715613142d8b54bec33
2
Author: Connor Etherington <[email protected]>
3
Date:   Thu Feb 29 02:40:50 2024 +0200
4
5
    Auto-Commit Update 29.02.2024 - 02:40:50
6
---
7
 .config.h.~1~         | 256 ------------------------------------
8
 AutoLinux             | Bin 118864 -> 135824 bytes
9
 AutoLinux.o           | Bin 112544 -> 132152 bytes
10
 LICENSE               |   2 +-
11
 config.h              | 352 +++++++++++++++++++++++++++++++++++++++++++++++++-
12
 definitions.h         |  13 ++
13
 drw.o                 | Bin 10320 -> 10320 bytes
14
 keybindings.c         | 225 --------------------------------
15
 keybindings.h         | 247 -----------------------------------
16
 keybinds.c            | 224 --------------------------------
17
 package.json          |  20 ---
18
 patch/cust/bar_date.c |   2 +-
19
 util.o                | Bin 2224 -> 2224 bytes
20
 13 files changed, 361 insertions(+), 980 deletions(-)
21
22
diff --git a/.config.h.~1~ b/.config.h.~1~
23
deleted file mode 100644
24
index 81a221f..0000000
25
--- a/.config.h.~1~
26
+++ /dev/null
27
@@ -1,256 +0,0 @@
28
-
29
-//                                      See LICENSE file for copyright and license details.                                     //
30
-//---------------------------------------------------------- Constants ---------------------------------------------------------//
31
-
32
-#define TERMINAL2 "alacritty"
33
-#define TERMCLASS2 "Alacritty"
34
-#define BROWSER "brave"
35
-#define TERMINAL "st"
36
-#define TERMCLASS "St"
37
-
38
-#define MODKEY Mod4Mask
39
-#define ALTKEY Mod1Mask
40
-#define CTRLKEY ControlMask
41
-
42
-#define NOMOD 0
43
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
44
-
45
-//--------------------------------------------------------- Appearance ---------------------------------------------------------//
46
-
47
-static unsigned int borderpx        = 2;              /* border pixel of windows */
48
-static unsigned int gappx           = 1;              /* pixel gap between clients */
49
-static unsigned int snap            = 30;             /* snap pixel */
50
-static unsigned int gappih          = 8;              /* horiz inner gap between windows */
51
-static unsigned int gappiv          = 8;              /* vert inner gap between windows */
52
-static unsigned int gappoh          = 12;             /* horiz outer gap between windows and screen edge */
53
-static unsigned int gappov          = 12;             /* vert outer gap between windows and screen edge */
54
-static int user_bh                  = 30;              /* 0 means that AutoLinux will calculate bar height, >= 1 means AutoLinux will user_bh as bar height */
55
-static int swallowfloating          = 5;              /* 5 means swallow floating windows by default */
56
-static int smartgaps                = 0;              /* 1 means no outer gap when there is only one window */
57
-static int showbar                  = 1;              /* 0 means no bar */
58
-static int topbar                   = 1;              /* 0 means bottom bar */
59
-static int horizpadbar              = 10;             /* horizontal padding for statusbar */
60
-static int vertpadbar               = 15;             /* vertical padding for statusbar */
61
-static int vertpad                  = 10;             /* vertical padding of bar */
62
-static int sidepad                  = 10;             /* horizontal padding of bar */
63
-
64
-
65
-static char dmenufont[]             =       "Mononoki Nerd Font:size=16.2:antialias=true:autohint=true" ;
66
-static char *fonts[]                = {     "Mononoki Nerd Font:size=16.2:antialias=true:autohint=true",
67
-                                            "monospace:size=11", "fontawesome:size=12",
68
-                                            "JoyPixels:pixelsize=10:antialias=true:autohint=true",
69
-                                            "Mononoki Nerd Font:size=9:antialias=true:autohint=true",
70
-                                            "Hack:size=10:antialias=true:autohint=true",
71
-                                            "JoyPixels:size=10:antialias=true:autohint=true"
72
-};
73
-
74
-
75
-//----------------------------------------------------------- Colors -----------------------------------------------------------//
76
-
77
-/* static char selfgcolor[]            = #1A2026; */
78
-static char normbgcolor[]           = "#1A2026";
79
-static char normbordercolor[]       = "#222222";
80
-static char normfgcolor[]           = "#41fdfe";
81
-static char selfgcolor[]            = "#00ff00";
82
-static char selbordercolor[]        = "#c9c9c9";
83
-static char selbgcolor[]            = "#1A2026";
84
-static char timefgcolor[]           = "#1A2026";
85
-static char timebordercolor[]       = "#ff2782";
86
-static char timebgcolor[]           = "#ff2782";
87
-static char activefgcolor[]         = "#efeff0";
88
-static char activebordercolor[]     = "#ff2782";
89
-static char activebgcolor[]         = "#0077aa";
90
-static char inactivefgcolor[]       = "#ff2782";
91
-static char inactivebordercolor[]   = "#ff2782";
92
-static char inactivebgcolor[]       = "#efeff0";
93
-
94
-static char *colors[][3] = {
95
-
96
-           /*               fg           bg           border   */
97
-       [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
98
-       [SchemeSel]  = { selfgcolor,  selbgcolor,  selbordercolor  },
99
-       [SchemeTime]  = { timefgcolor, timebgcolor, timebordercolor },
100
-       [SchemeActive]  = { activefgcolor, activebgcolor, activebordercolor },
101
-       [SchemeInactive]  = { inactivefgcolor, inactivebgcolor, inactivebordercolor },
102
-
103
-};
104
-
105
-typedef struct {
106
-	const char *name;
107
-	const void *cmd;
108
-} Sp;
109
-const char *spcmd1[] = {TERMINAL, "-n", "spterm", "-g", "160x50", NULL };
110
-const char *spcmd2[] = {TERMINAL, "-n", "spcalc", "-f", "monospace:size=16", "-g", "50x20", "-e", "bc", "-lq", NULL };
111
-const char *spcmd3[] = {TERMINAL, "-n", "spala", "-g", "160x50", NULL };
112
-const char *spcmd4[] = {TERMINAL, "-n", "spalat", "-g", "160x50", "-e", "gogb", NULL };
113
-const char *spcmd5[] = {TERMINAL, "-n", "spgbmon", "-g", "160x50", "-e", "gbmonit", NULL };
114
-const char *spcmd6[] = {BROWSER,  NULL };
115
-
116
-static Sp scratchpads[] = {
117
-
118
-	/* name          cmd  */
119
-	{"spterm",      spcmd1},
120
-	{"spcalc",      spcmd2},
121
-	{"spala",       spcmd3},
122
-	{"spalat",      spcmd4},
123
-	{"spgbmon",     spcmd5},
124
-	{"spbrowser",   spcmd6},
125
-};
126
-
127
-//----------------------------------------------------------- Tagging ----------------------------------------------------------//
128
-
129
-static const char *tags[] =   { " 1 ", " 2 ", " 3 ", " 4 ", "  ", " 6 ", " 7 ", " 8 ", " 9 " };
130
-//static const char *tags[] =   { "  ", "  ", "  ", "  ", "  ", "  ", "  ", "  ", "  " };
131
-//static const char *tags[] =   { " 1 ", " 2 ", " 3 ", " 4 ", "  ", " 6 ", " 7 ", " 8 ", " 9 " };
132
-//static const char *tags[] =   { "  ", "  ", "  ", "  ", "  ", "  ", "  ", "  " };
133
-// static const char *tags[] =  {  " ", " ", " ", " ", " ", " ", " ", " ", " "  };
134
-
135
-
136
-static const Rule rules[] = {
137
-	/* xprop(1):
138
-	 *	WM_CLASS(STRING) = instance, class
139
-	 *	WM_NAME(STRING) = title
140
-	*/
141
-	/* class    instance      title       	 tags mask    isfloating   isterminal  noswallow  monitor */
142
-	{ "Gimp",     NULL,       NULL,       	    1 << 8,       0,           0,         0,        -1 },
143
-	{ TERMCLASS,  NULL,       NULL,       	    0,            0,           1,         0,        -1 },
144
-	{ NULL,       NULL,       "Event Tester",   0,            0,           0,         1,        -1 },
145
-	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     1,           1,         0,        -1 },
146
-	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     1,           1,         0,        -1 },
147
-	{ NULL,      "spala",     NULL,             SPTAG(2),     1,           1,         0,        -1 },
148
-	{ NULL,      "spalat",    NULL,             SPTAG(3),     1,           1,         0,        -1 },
149
-	{ NULL,      "spgbmon",   NULL,             SPTAG(4),     1,           1,         0,        -1 },
150
-	{ NULL,      "spbrowser", NULL,             SPTAG(5),     1,           1,         0,        -1 },
151
-};
152
-
153
-
154
-//-------------------------------------------------------- Bar Allignment -------------------------------------------------------//
155
-
156
-static const BarRule barrules[] = {
157
-   	/* monitor  bar    alignment               widthfunc              drawfunc              clickfunc           name */
158
- /* { -1,       0,     BAR_ALIGN_LEFT,         width_tags,            draw_tags,            click_tags,         "tags"     }, */
159
-  	{ -1,       0,     BAR_ALIGN_CENTER,       width_tags,            draw_tags,            click_tags,         "tags"     },
160
-    { -1,       0,     BAR_ALIGN_LEFT_LEFT,    width_ltsymbol,        draw_ltsymbol,        click_ltsymbol,     "layout"   },
161
-    //{ 0,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_status,       "time"     },
162
-    { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_date,            draw_date,            click_date,       "date"     },
163
-    { 1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_time,       "time"     },
164
-    { 0,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            clickk_time,       "time"     },
165
-    { 1,        0,     BAR_ALIGN_LEFT,         width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" },
166
-};
167
-
168
-
169
-//----------------------------------------------------------- Layouts -----------------------------------------------------------//
170
-
171
-static float mfact     = 0.55; /* factor of master area size [0.1..0.90] */
172
-static int nmaster     = 1;    /* number of clients in master area */
173
-static int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
174
-#define FORCE_VSPLIT 1  /* nrowgrid layout: force two clients to always split vertically */
175
-#include "vanitygaps.c"
176
-static const Layout layouts[] = {
177
-	/* symbol     arrange function */
178
-	{ "[]=",	monocle },			/* Default: Master on left, slaves on right */
179
-	{ "",	bstack },		/* Master on top, slaves on bottom */
180
-
181
-/*	{ "[@]",	spiral },		 Fibonacci spiral */
182
-/*	{ "[\\]",	dwindle },		 Decreasing in size right and leftward */
183
-
184
-	{ "",	deck },			/* Master on left, slaves in monocle-like mode on right */
185
-	{ "",	tile },		/* All windows on top of eachother */
186
-
187
-	{ "",	centeredmaster },		/* Master in middle, slaves on sides */
188
-	{ "",	centeredfloatingmaster },	/* Same but master floats */
189
-
190
-	{ "",	NULL },			/* no layout function means floating behavior */
191
-	{ "",		NULL },
192
-};
193
-
194
-
195
-//--------------------------------------------------------- Key Definitions -----------------------------------------------------//
196
-
197
-
198
-#define TAGKEYS(KEY,         TAG) \
199
-	{ MODKEY,                       KEY,               view,           {.ui = 1 << TAG} }, \
200
-	{ ALTKEY,                       KEY,               tag,            {.ui = 1 << TAG} }, \
201
-	{ MODKEY|ControlMask,           KEY,               toggleview,     {.ui = 1 << TAG} }, \
202
-	{ MODKEY|ShiftMask,             KEY,               tag,            {.ui = 1 << TAG} }, \
203
-	{ MODKEY|ControlMask|ShiftMask, KEY,               toggletag,      {.ui = 1 << TAG} },
204
-#define STACKKEYS(MOD,ACTION) \
205
-	{ MOD,	XK_j,	        ACTION##stack,	{.i = INC(+1) } }, \
206
-	{ MOD,	XK_k,	        ACTION##stack,	{.i = INC(-1) } }, \
207
-	{ MOD,  XK_BackSpace, ACTION##stack, {.i = PREVSEL } }, \
208
-  { MOD,  XK_comma,    ACTION##stack,  {.i = 0 } }, \
209
-	{ MOD,  XK_Up,	    ACTION##stack,	{.i = INC(+1) } }, \
210
-	{ MOD,  XK_Down,	ACTION##stack,	{.i = INC(-1) } }, \
211
-	/* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */
212
-	/* { MOD, XK_a,     ACTION##stack, {.i = 1 } }, \ */
213
-	/* { MOD, XK_z,     ACTION##stack, {.i = 2 } }, \ */
214
-	/* { MOD, XK_x,     ACTION##stack, {.i = -1 } }, */
215
-
216
-/* helper for spawning shell commands in the pre AutoLinux-5.0 fashion */
217
-
218
-/* commands */
219
-static const char *termcmd[]   = { TERMINAL,  NULL };
220
-static const char *term2cmd[]   = { TERMINAL2,  NULL };
221
-
222
-
223
-
224
-//------------------------------------------  Xresources preferences to load at startup  ----------------------------------------//
225
-
226
-ResourcePref resources[] = {
227
-		{ "color0",	         STRING,	&normbordercolor },
228
-		{ "color8",	         STRING,	&selbordercolor },
229
-		{ "color0",	         STRING,	&normbgcolor },
230
-		{ "color4",	         STRING,	&normfgcolor },
231
-		{ "color0",	         STRING,	&selfgcolor },
232
-		{ "color4",	         STRING,	&selbgcolor },
233
-		{ "borderpx",        INTEGER,   &borderpx },
234
-		{ "snap",	         INTEGER,   &snap },
235
-		{ "showbar",         INTEGER,   &showbar },
236
-		{ "topbar",	         INTEGER,   &topbar },
237
-		{ "nmaster",         INTEGER,   &nmaster },
238
-		{ "resizehints",	 INTEGER,   &resizehints },
239
-		{ "mfact",           FLOAT,	    &mfact },
240
-		{ "gappih",          INTEGER,   &gappih },
241
-		{ "gappiv",          INTEGER,   &gappiv },
242
-		{ "gappoh",          INTEGER,   &gappoh },
243
-		{ "gappov",          INTEGER,   &gappov },
244
-		{ "swallowfloating", INTEGER,   &swallowfloating },
245
-		{ "smartgaps",		 INTEGER,   &smartgaps },
246
-};
247
-
248
-#include <X11/XF86keysym.h>
249
-#include "shiftview.c"
250
-
251
-//-------------------------------------------------------- Keybindings ----------------------------------------------------------//
252
-
253
-#include "keybinds.c"
254
-
255
-//---------------------------------------------------- Button Definitions -------------------------------------------------------//
256
-
257
-/* button definitions */
258
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
259
-static Button buttons[] = {
260
-	/* click                event mask      button          function        argument */
261
-#ifndef __OpenBSD__
262
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
263
-	{ ClkStatusText,        0,              Button1,        sigdwmblocks,   {.i = 1} },
264
-	{ ClkStatusText,        0,              Button2,        sigdwmblocks,   {.i = 2} },
265
-	{ ClkStatusText,        0,              Button3,        sigdwmblocks,   {.i = 3} },
266
-	{ ClkStatusText,        0,              Button4,        sigdwmblocks,   {.i = 4} },
267
-	{ ClkStatusText,        0,              Button5,        sigdwmblocks,   {.i = 5} },
268
-	{ ClkStatusText,        ShiftMask,      Button1,        sigdwmblocks,   {.i = 6} },
269
-#endif
270
-	{ ClkStatusText,        ShiftMask,      Button3,        spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/dwmblocks/config.h") },
271
-	{ ClkClientWin,         MODKEY,                  Button1,        movemouse,      {0} },
272
-	{ ClkClientWin,         MODKEY,                  Button2,        defaultgaps,	{0} },
273
-	{ ClkClientWin,         MODKEY,                  Button3,        resizemouse,    {0} },
274
-	{ ClkClientWin,		MODKEY,         		Button4,	incrgaps,	{.i = +1} },
275
-	{ ClkClientWin,		MODKEY,         		Button5,	incrgaps,	{.i = -1} },
276
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
277
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
278
-	{ ClkTagBar,            MODKEY,                  Button1,        tag,            {0} },
279
-	{ ClkTagBar,            MODKEY,                  Button3,        toggletag,      {0} },
280
-	{ ClkTagBar,		0,		Button4,	shiftview,	{.i = -1} },
281
-	{ ClkTagBar,		0,		Button5,	shiftview,	{.i = 1} },
282
-	{ ClkRootWin,		0,		Button2,	togglebar,	{0} },
283
-};
284
diff --git a/AutoLinux b/AutoLinux
285
index 06a4bda..ea0bff9 100755
286
Binary files a/AutoLinux and b/AutoLinux differ
287
diff --git a/AutoLinux.o b/AutoLinux.o
288
index ab9c8d1..a3bffc0 100644
289
Binary files a/AutoLinux.o and b/AutoLinux.o differ
290
diff --git a/LICENSE b/LICENSE
291
index fc2a754..d93cadd 100644
292
--- a/LICENSE
293
+++ b/LICENSE
294
@@ -18,7 +18,7 @@ MIT/X Consortium License
295
 © 2015-2016 Eric Pruitt <[email protected]>
296
 © 2016-2017 Markus Teich <[email protected]>
297
 © 2019-2020 Luke Smith <[email protected]>
298
-© 2021-2022 Connor Etherington <[email protected]>
299
+© 2021-2023 Connor Etherington <[email protected]>
300
 
301
 Permission is hereby granted, free of charge, to any person obtaining a
302
 copy of this software and associated documentation files (the "Software"),
303
diff --git a/config.h b/config.h
304
index 576174f..90fbdd7 100644
305
--- a/config.h
306
+++ b/config.h
307
@@ -8,11 +8,15 @@
308
 #define BROWSER "brave"
309
 #define MODKEY Mod4Mask
310
 #define ALTKEY Mod1Mask
311
+#define BACSLASH 0x5c
312
 #define CTRLKEY ControlMask
313
 #define NOMOD 0
314
 
315
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
316
 
317
+#define HARD CTRLKEY|ALTKEY|MODKEY
318
+#define FUZZY CTRLKEY|ALTKEY|ShiftMask
319
+#define IMPOSSIBLE CTRLKEY|ALTKEY|MODKEY|ShiftMask
320
 
321
 //--------------------------------------------------------- Appearance ---------------------------------------------------------//
322
 
323
@@ -81,8 +85,8 @@ typedef struct {
324
 const char *spcmd1[] = {TERMINAL, "-n", "spterm", "-g", "160x50", NULL };
325
 const char *spcmd2[] = {TERMINAL, "-n", "spcalc", "-f", "monospace:size=16", "-g", "50x20", "-e", "bc", "-lq", NULL };
326
 const char *spcmd3[] = {TERMINAL, "-n", "spala", "-g", "160x50", NULL };
327
-const char *spcmd4[] = {TERMINAL, "-n", "spalat", "-g", "160x50", "-e", "gogb", NULL };
328
-const char *spcmd5[] = {TERMINAL, "-n", "spgbmon", "-g", "160x50", "-e", "gbmonit", NULL };
329
+const char *spcmd4[] = {TERMINAL, "-n", "spalat", "-g", "160x50", "-e", "bindStart", NULL };
330
+const char *spcmd5[] = {TERMINAL, "-n", "spalac", "-g", "175x52", NULL };
331
 const char *spcmd6[] = {BROWSER,  NULL };
332
 
333
 static Sp scratchpads[] = {
334
@@ -92,7 +96,7 @@ static Sp scratchpads[] = {
335
 	{"spcalc",      spcmd2},
336
 	{"spala",       spcmd3},
337
 	{"spalat",      spcmd4},
338
-	{"spgbmon",     spcmd5},
339
+	{"spslsc",      spcmd5},
340
 	{"spbrowser",   spcmd6},
341
 };
342
 
343
@@ -118,7 +122,7 @@ static const Rule rules[] = {
344
 	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     1,           1,         0,        -1 },
345
 	{ NULL,      "spala",     NULL,             SPTAG(2),     1,           1,         0,        -1 },
346
 	{ NULL,      "spalat",    NULL,             SPTAG(3),     1,           1,         0,        -1 },
347
-	{ NULL,      "spgbmon",   NULL,             SPTAG(4),     1,           1,         0,        -1 },
348
+	{ NULL,      "spalac",    NULL,             SPTAG(4),     1,           1,         0,        -1 },
349
 	{ NULL,      "spbrowser", NULL,             SPTAG(5),     1,           1,         0,        -1 },
350
 };
351
 
352
@@ -132,9 +136,9 @@ static const BarRule barrules[] = {
353
     { -1,       0,     BAR_ALIGN_LEFT_LEFT,    width_ltsymbol,        draw_ltsymbol,        click_ltsymbol,     "layout"   },
354
     //{ 0,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_status,       "time"     },
355
     { -1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_date,            draw_date,            click_date,       "date"     },
356
+    { 0,        0,     BAR_ALIGN_LEFT,         width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" },
357
     { 1,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            click_time,       "time"     },
358
     { 0,        0,     BAR_ALIGN_RIGHT_RIGHT,  width_time,            draw_time,            clickk_time,       "time"     },
359
-    { 1,        0,     BAR_ALIGN_LEFT,         width_wintitle,        draw_wintitle,        click_wintitle,     "wintitle" },
360
 };
361
 
362
 
363
@@ -222,7 +226,343 @@ ResourcePref resources[] = {
364
 
365
 //-------------------------------------------------------- Keybindings ----------------------------------------------------------//
366
 
367
-#include "keybinds.c"
368
+
369
+static Key keys[] = {
370
+	/* modifier                     key        function        argument */
371
+	STACKKEYS(MODKEY,                          focus)
372
+	STACKKEYS(ALTKEY,                          push)
373
+	STACKKEYS(MODKEY|ShiftMask,                push)
374
+	/* { MODKEY|ShiftMask,		XK_Escape,	spawn,	SHCMD("") }, */
375
+	{ MODKEY,         			XK_grave,	spawn,	SHCMD("dmenuunicode") },
376
+	/* { MODKEY|ShiftMask,		XK_grave,	togglescratch,	SHCMD("") }, */
377
+	TAGKEYS(			XK_1,		0)
378
+	TAGKEYS(			XK_2,		1)
379
+	TAGKEYS(			XK_3,		2)
380
+	TAGKEYS(			XK_4,		3)
381
+	TAGKEYS(			XK_5,		4)
382
+	TAGKEYS(			XK_6,		5)
383
+	TAGKEYS(			XK_7,		6)
384
+	TAGKEYS(			XK_8,		7)
385
+	TAGKEYS(  		XK_9,		8)
386
+
387
+  { MODKEY,             XK_F12,     spawn,		SHCMD("cpSecPass 1") },
388
+  { MODKEY,             XK_F11,     spawn,		SHCMD("cpSecPass 2") },
389
+  { MODKEY,             XK_F6,      spawn,		SHCMD("cpSecPass 3") },
390
+  { MODKEY,             XK_F9,      spawn,		SHCMD("cpSecPass 5") },
391
+  { MODKEY,             XK_F10,     spawn,		SHCMD("cpSecPass 6") },
392
+  { MODKEY,             XK_F7,     spawn,		SHCMD("cpSecPass 8") },
393
+  { ALTKEY|ShiftMask,   XK_F10,     spawn,		SHCMD("clipmenu") },
394
+  { MODKEY,             XK_F11,     spawn,		SHCMD("clipmenu") },
395
+  { MODKEY,             XK_F8,      spawn,		SHCMD("cpSecPass 7") },
396
+
397
+
398
+  // Impossible Mapps (MODKEY + ALTKEY + ShiftMask + <key> :
399
+
400
+
401
+
402
+  // Impossible Dirs:
403
+
404
+  { IMPOSSIBLE,         XK_p,       spawn,     SHCMD("impossible_bindings p") },
405
+
406
+  // Impossible Programs:
407
+
408
+  { IMPOSSIBLE,         XK_p,       spawn,     SHCMD("impossible_bindings p") },
409
+  { IMPOSSIBLE,         XK_w,       spawn,     SHCMD("impossible_bindings w") },
410
+  { IMPOSSIBLE,         XK_e,       spawn,     SHCMD("impossible_bindings e") },
411
+  { IMPOSSIBLE,         XK_r,       spawn,     SHCMD(TERMINAL2 " -e sh -c 'bpytop'") },
412
+  { IMPOSSIBLE,         XK_t,       spawn,     SHCMD(TERMINAL2 " -e top") },
413
+  { IMPOSSIBLE,         XK_a,       spawn,     SHCMD("impossible_bindings a") },
414
+  { IMPOSSIBLE,         XK_s,       spawn,     SHCMD("impossible_bindings s") },
415
+  { IMPOSSIBLE,         XK_S,       spawn,     SHCMD("impossible_bindings s") },
416
+  { IMPOSSIBLE,         XK_W,       spawn,     SHCMD("impossible_bindings w") },
417
+  { IMPOSSIBLE,         XK_d,       spawn,     SHCMD("impossible_bindings d") },
418
+  { IMPOSSIBLE,         XK_f,       spawn,     SHCMD("impossible_bindings f") },
419
+  { IMPOSSIBLE,         XK_g,       spawn,     SHCMD(TERMINAL2 " -e sh -c 'echo -en \"\\e[?25l\"; gpumon'") },
420
+  { IMPOSSIBLE,         XK_z,       spawn,     SHCMD("impossible_bindings z") },
421
+  { IMPOSSIBLE,         XK_x,       spawn,     SHCMD("impossible_bindings x") },
422
+  { IMPOSSIBLE,         XK_c,       spawn,     SHCMD("impossible_bindings c") },
423
+  { IMPOSSIBLE,         XK_v,       spawn,     SHCMD("impossible_bindings v") },
424
+  { IMPOSSIBLE,         XK_b,       spawn,     SHCMD("impossible_bindings b") },
425
+  { IMPOSSIBLE,         XK_period,  spawn,     SHCMD("impossible_bindings .") },
426
+
427
+  { IMPOSSIBLE,         XK_y,       spawn,     SHCMD("impossible_bindings y") },
428
+  { IMPOSSIBLE,         XK_u,       spawn,     SHCMD("impossible_bindings u") },
429
+  { IMPOSSIBLE,         XK_i,       spawn,     SHCMD("impossible_bindings i") },
430
+  { IMPOSSIBLE,         XK_o,       spawn,     SHCMD("impossible_bindings o") },
431
+  { IMPOSSIBLE,         XK_p,       spawn,     SHCMD("impossible_bindings p") },
432
+  { IMPOSSIBLE,         XK_h,       spawn,     SHCMD("impossible_bindings h") },
433
+  { IMPOSSIBLE,         XK_j,       spawn,     SHCMD("impossible_bindings j") },
434
+  { IMPOSSIBLE,         XK_k,       spawn,     SHCMD("impossible_bindings k") },
435
+  { IMPOSSIBLE,         XK_l,       spawn,     SHCMD("impossible_bindings l") },
436
+  { IMPOSSIBLE,         XK_n,       spawn,     SHCMD("impossible_bindings n") },
437
+  { IMPOSSIBLE,         XK_m,       spawn,     SHCMD("impossible_bindings m") },
438
+
439
+  { IMPOSSIBLE,         XK_0,       spawn,     SHCMD("impossible_bindings 0") },
440
+  { IMPOSSIBLE,         XK_1,       spawn,     SHCMD("impossible_bindings 1") },
441
+  { IMPOSSIBLE,         XK_2,       spawn,     SHCMD("impossible_bindings 2") },
442
+  { IMPOSSIBLE,         XK_3,       spawn,     SHCMD("impossible_bindings 3") },
443
+  { IMPOSSIBLE,         XK_4,       spawn,     SHCMD("impossible_bindings 4") },
444
+  { IMPOSSIBLE,         XK_5,       spawn,     SHCMD("impossible_bindings 5") },
445
+  { IMPOSSIBLE,         XK_6,       spawn,     SHCMD("impossible_bindings 6") },
446
+  { IMPOSSIBLE,         XK_7,       spawn,     SHCMD("impossible_bindings 7") },
447
+  { IMPOSSIBLE,         XK_8,       spawn,     SHCMD("impossible_bindings 8") },
448
+  { IMPOSSIBLE,         XK_9,       spawn,     SHCMD("impossible_bindings 9") },
449
+
450
+  { HARD,               XK_p,       spawn,     SHCMD("hard_bindings p") },
451
+  { HARD,               XK_w,       spawn,     SHCMD("hard_bindings w") },
452
+  { HARD,               XK_e,       spawn,     SHCMD("hard_bindings e") },
453
+  { HARD,               XK_r,       spawn,     SHCMD("hard_bindings r") },
454
+  { HARD,               XK_t,       spawn,     SHCMD("hard_bindings t") },
455
+  { HARD,               XK_a,       spawn,     SHCMD("hard_bindings a") },
456
+  { HARD,               XK_s,       spawn,     SHCMD("hard_bindings s") },
457
+  { HARD,               XK_d,       spawn,     SHCMD("hard_bindings d") },
458
+  { HARD,               XK_f,       spawn,     SHCMD("hard_bindings f") },
459
+  { HARD,               XK_g,       spawn,     SHCMD("hard_bindings g") },
460
+  { HARD,               XK_z,       spawn,     SHCMD("hard_bindings z") },
461
+  { HARD,               XK_x,       spawn,     SHCMD("hard_bindings x") },
462
+  { HARD,               XK_c,       spawn,     SHCMD("hard_bindings c") },
463
+  { HARD,               XK_v,       spawn,     SHCMD("hard_bindings v") },
464
+  { HARD,               XK_b,       spawn,     SHCMD("hard_bindings b") },
465
+  { HARD,               XK_y,       spawn,     SHCMD("hard_bindings y") },
466
+  { HARD,               XK_u,       spawn,     SHCMD("hard_bindings u") },
467
+  { HARD,               XK_i,       spawn,     SHCMD("hard_bindings i") },
468
+  { HARD,               XK_o,       spawn,     SHCMD("hard_bindings o") },
469
+  { HARD,               XK_p,       spawn,     SHCMD("hard_bindings p") },
470
+  { HARD,               XK_h,       spawn,     SHCMD("hard_bindings h") },
471
+  { HARD,               XK_j,       spawn,     SHCMD("hard_bindings j") },
472
+  { HARD,               XK_k,       spawn,     SHCMD("hard_bindings k") },
473
+  { HARD,               XK_l,       spawn,     SHCMD("hard_bindings l") },
474
+  { HARD,               XK_n,       spawn,     SHCMD("hard_bindings n") },
475
+  { HARD,               XK_m,       spawn,     SHCMD("hard_bindings m") },
476
+
477
+
478
+  { MODKEY,             XK_plus,    spawn,     SHCMD("hard_bindings +") },
479
+  { MODKEY,             XK_equal,   spawn,     SHCMD("hard_bindings +") },
480
+  { MODKEY,             XK_minus,   spawn,     SHCMD("hard_bindings -") },
481
+  { MODKEY,             XK_F12,     spawn,     SHCMD("hard_bindings [") },
482
+
483
+
484
+
485
+
486
+  { HARD,               XK_t,       spawn,     SHCMD(TERMINAL2 " -e sh -c 'td'") },
487
+
488
+
489
+
490
+  { FUZZY,         XK_p,       spawn,     SHCMD("fuzzy_bindings p") },
491
+  { FUZZY,         XK_1,       spawn,     SHCMD("fuzzy_bindings 1") },
492
+
493
+
494
+
495
+
496
+
497
+
498
+
499
+
500
+
501
+
502
+
503
+
504
+
505
+
506
+
507
+  // Scratch Pads:
508
+
509
+	{ MODKEY,		XK_s,	 togglescratch, {.ui = 0 } },
510
+	{ ALTKEY,		XK_Return,  togglescratch, {.ui = 1 } },
511
+	{ MODKEY,		XK_backslash,	togglescratch, {.ui = 4 } },
512
+	{ MODKEY|ShiftMask,		XK_backslash,	togglescratch, {.ui = 3 } },
513
+	{ MODKEY|ControlMask, XK_period,  spawn, SHCMD(TERMINAL " -e job") },
514
+  { MODKEY,   XK_Escape,    spawn, SHCMD("startJustine") },
515
+	{ MODKEY,   XK_slash,	    spawn, SHCMD("startJustineSilent") },
516
+
517
+
518
+
519
+
520
+  { MODKEY,         			XK_0,		view,		{.ui = ~0 } },
521
+	{ MODKEY|ShiftMask,		XK_0,		tag,		{.ui = ~0 } },
522
+	{ MODKEY,         			XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") },
523
+//	{ MODKEY|ShiftMask,		XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") },
524
+ // { MODKEY,         			XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") },
525
+	{ MODKEY|ShiftMask,		XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") },
526
+	{ MODKEY,         			XK_BackSpace,	spawn,		SHCMD("sysact") },
527
+	{ MODKEY|ShiftMask,		XK_BackSpace,	spawn,		SHCMD("sysact") },
528
+
529
+
530
+/*  { MODKEY|ShiftMask,        XK_a, scratchpad_show, {0} },
531
+	{ MODKEY|ShiftMask,        XK_s, scratchpad_hide, {0} },
532
+	{ MODKEY|ShiftMask|ALTKEY, XK_equal,scratchpad_remove,{0} },
533
+  */
534
+	{ MODKEY,         			XK_Tab,		view,		{0} },
535
+	{ ALTKEY,         			XK_Tab,	  spawn,		SHCMD("nemo") },
536
+/* { MODKEY|ShiftMask,		XK_Tab,		spawn,		SHCMD("") }, */
537
+	{ MODKEY,         			XK_q,		killclient,	{0} },
538
+	{ MODKEY|ShiftMask,		XK_q,		spawn,		SHCMD("sysact") },
539
+	{ MODKEY,         			XK_w,		spawn,		SHCMD("$BROWSER") },
540
+	{ MODKEY|ShiftMask,	XK_w,		spawn,		SHCMD("$BROWSER2") },
541
+  { MODKEY,                	XK_c,		spawn,		SHCMD("clipdl") },
542
+  { MODKEY|ShiftMask,       XK_c,		spawn,		SHCMD(TERMINAL2 " -e tdap") },
543
+  { CTRLKEY|ShiftMask,     XK_c,		spawn,		SHCMD("xdotool type '[email protected]'") },
544
+
545
+/*	{ MODKEYask,		XK_w,		spawn,		SHCMD(TERMINAL " -e sudo nmtui") }, */
546
+	{ MODKEY,         		XK_e,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },
547
+	{ MODKEY|ShiftMask,		XK_e,		spawn,		SHCMD("rofi -modi emoji -show emoji") },
548
+	{ MODKEY,         		XK_r,		spawn,		SHCMD(TERMINAL2 " -e sh -c 'bpytop'") },
549
+	{ MODKEY|ShiftMask,		XK_r,		spawn,		SHCMD(TERMINAL2 " -e sh -c 'bpytop'") },
550
+	{ ALTKEY,         		XK_y,	  spawn,     SHCMD("youtube-music") },
551
+	{ MODKEY,         		XK_t,		setlayout,	{.v = &layouts[0]} }, /* tile */
552
+	{ MODKEY,		          XK_i,		setlayout,	{.v = &layouts[3]} }, /* dwindle */
553
+	{ MODKEY,         		XK_u,		setlayout,	{.v = &layouts[2]} }, /* deck */
554
+	{ MODKEY,         		XK_y,		setlayout,	{.v = &layouts[0]} }, /* centeredmaster */
555
+	{ MODKEY,         		XK_o,		setlayout,  {.v = &layouts[4]} },
556
+	{ MODKEY|ShiftMask,		XK_u,		setlayout,	{.v = &layouts[5]} }, /* monocle */
557
+	{ MODKEY|ShiftMask,		XK_i,		setlayout,	{.v = &layouts[7]} }, /* centeredfloatingmaster */
558
+	{ MODKEY|ShiftMask,		XK_t,		setlayout,	{.v = &layouts[1]} }, /* bstack */
559
+	{ MODKEY|ShiftMask,   XK_y,		setlayout,	{.v = &layouts[4]} }, /* spiral */
560
+	{ MODKEY,         		XK_p,		incnmaster,     {.i = +1 } },
561
+	{ MODKEY|ShiftMask,		XK_p,		incnmaster,     {.i = -1 } },
562
+/*	{ MODKEY,         			XK_p,		spawn,		SHCMD("mpc toggle") },
563
+	{ MODKEY|ShiftMask,	XK_p,		spawn,		SHCMD("mpc pause ; pauseallmpv") },*/
564
+
565
+    { MODKEY,         			XK_bracketleft,		spawn,		SHCMD("mpc seek -10") },
566
+	{ MODKEY|ShiftMask,	XK_bracketleft,		spawn,		SHCMD("mpc seek -60") },
567
+	{ MODKEY,         			XK_bracketright,	spawn,		SHCMD("mpc seek +10") },
568
+	{ MODKEY|ShiftMask,	XK_bracketright,	spawn,		SHCMD("mpc seek +60") },
569
+//	{ MODKEY,         			XK_backslash,		view,		{0} },
570
+	/* { MODKEY|ShiftMask,		XK_backslash,		spawn,		SHCMD("") }, */
571
+//  { ALTKEY,             XK_backslash,	spawn,		SHCMD(TERMINAL2 " -e scratchFile") },
572
+  { CTRLKEY|ShiftMask,   XK_equal,	spawn,		SHCMD("aopac +") },
573
+  { CTRLKEY|ShiftMask,   XK_minus,	spawn,		SHCMD("aopac -") },
574
+
575
+
576
+	{ MODKEY,         			XK_a,		togglegaps,	{0} },
577
+	{ MODKEY|ShiftMask,     XK_a,		defaultgaps,	{0} },
578
+//	{ MODKEY,         			XK_s,		togglesticky,	{0} },
579
+  { MODKEY|ShiftMask,		XK_s,		spawn,     SHCMD("gnome-screenshot -i") },
580
+	{ MODKEY,         			XK_d,		spawn,          SHCMD("rfi") },
581
+	{ MODKEY|ALTKEY,         			XK_d,		spawn,  SHCMD("rfi") },
582
+	{ MODKEY|ALTKEY,         		  XK_b,		spawn,		SHCMD("passmenu") },
583
+	{ MODKEY,               XK_f,		togglefullscr,	{0} },
584
+	{ MODKEY|ShiftMask,     XK_f,		setlayout,	{.v = &layouts[8]} },
585
+	{ MODKEY,               XK_g,		shiftview,	{ .i = -1 } },
586
+	{ MODKEY|ShiftMask,     XK_g,		shifttag,	{ .i = -1 } },
587
+  { ALTKEY,               XK_g,		spawn,		SHCMD(TERMINAL2 " -e gpumon") },
588
+	{ MODKEY,               XK_h,		setmfact,	{.f = -0.05} },
589
+	{ ALTKEY,               XK_h,		spawn,    SHCMD(TERMINAL2 " -e top") },
590
+	{ MODKEY,               XK_l,		setmfact,      	{.f = +0.05} },
591
+	{ MODKEY|ShiftMask,     XK_l,		spawn,    SHCMD("formdata") },
592
+  { CTRLKEY|ShiftMask,    XK_l,		spawn,    SHCMD("chlnk") },
593
+//	{ MODKEY,               XK_semicolon,	shiftview,	{ .i = 1 } },
594
+	{ MODKEY|ShiftMask,     XK_semicolon,	shifttag,	{ .i = 1 } },
595
+	{ ALTKEY|ShiftMask,     XK_p, spawn, SHCMD(TERMINAL2 " -e snipSnip&&notify-send '✅ Coppied from Clipboard'") },
596
+	{ ALTKEY|ShiftMask,     XK_o, spawn, SHCMD(TERMINAL2 " -e snipSnip -o&&notify-send '✅ Saved to Clipboard'") },
597
+	{ MODKEY,               XK_apostrophe,	togglescratch,	{.ui = 1} },
598
+	/* { MODKEY|ShiftMask,	XK_apostrophe,	spawn,		SHCMD("") }, */
599
+	{ MODKEY,               XK_Return,	spawn,		{.v = term2cmd } },
600
+	{ MODKEY,               XK_z,		incrgaps,	{.i = +3 } },
601
+	/* { MODKEY|ShiftMask,	XK_z,		spawn,		SHCMD("") }, */
602
+	{ MODKEY,               XK_x,		incrgaps,	{.i = -3 } },
603
+	/* { MODKEY|ShiftMask,	XK_x,		spawn,		SHCMD("") }, */
604
+	/* { MODKEY,         		XK_c,		spawn,		SHCMD("") }, */
605
+	/* { MODKEY|ShiftMask,	XK_c,		spawn,		SHCMD("") }, */
606
+	/* V is automatically bound above in STACKKEYS */
607
+	{ MODKEY,         			XK_b,		togglebar,	{0} },
608
+	{ MODKEY|ShiftMask,			XK_b,		spawn,    SHCMD("blueberry") },
609
+	/* { MODKEY|ShiftMask, 	XK_b,		spawn,		SHCMD("") }, */
610
+	{ MODKEY,         			XK_n,		spawn,		SHCMD(TERMINAL2 " -e vnote") },
611
+	{ MODKEY|ShiftMask,     XK_n,		spawn,		SHCMD(TERMINAL2 " -e [ ! -d $HOME/Documents ] && mkdir $HOME/Documents >/dev/null 2>&1; ${TERMINAL} -e nvim $HOME/Documents/notes") },
612
+  { ALTKEY,               XK_n,		spawn,		SHCMD(TERMINAL2 " -e nemo") },
613
+  { ALTKEY,               XK_m,		spawn,		SHCMD(TERMINAL2 " -e top") },
614
+	{ MODKEY,         			XK_m,		spawn,		SHCMD(TERMINAL2 " -e ncmpcpp") },
615
+
616
+	{ MODKEY|ShiftMask,     XK_m,		spawn,		SHCMD(TERMINAL " -e mpv `xclip -selection primary -o`") },
617
+	{ MODKEY,         			XK_comma,	spawn,		SHCMD("mpc prev") },
618
+	{ MODKEY|ShiftMask,     XK_comma,	spawn,		SHCMD("mpc seek 0%") },
619
+	{ MODKEY,         			XK_period,	spawn,		SHCMD(TERMINAL2 " -e qcopy") },
620
+	{ ALTKEY,         			XK_period,	spawn,		SHCMD(TERMINAL2 " -e editenv --ignore-sourced-warning") },
621
+	{ MODKEY|ShiftMask,     XK_period,	spawn,		SHCMD("mpc repeat") },
622
+
623
+	{ MODKEY,         			XK_Left,	focusmon,	{.i = -1 } },
624
+	{ MODKEY|ShiftMask,     XK_Left,	tagmon,		{.i = -1 } },
625
+	{ MODKEY,         			XK_Right,	focusmon,	{.i = +1 } },
626
+	{ MODKEY|ShiftMask,     XK_Right,	tagmon,		{.i = +1 } },
627
+
628
+	{ MODKEY,         			XK_Page_Up,	shiftview,	{ .i = -1 } },
629
+	{ MODKEY|ShiftMask,     XK_Page_Up,	shifttag,	{ .i = -1 } },
630
+	{ MODKEY,         			XK_Page_Down,	shiftview,	{ .i = +1 } },
631
+	{ MODKEY|ShiftMask,     XK_Page_Down,	shifttag,	{ .i = +1 } },
632
+	{ MODKEY,         			XK_Insert,	spawn,		SHCMD("xdotool type $(grep -v '^#' ~/.local/share/Nu1LL1nuX/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
633
+
634
+	{ MODKEY,         			XK_F2,		spawn,		SHCMD("flameshot gui") },
635
+	{ MODKEY,         			XK_F1,		spawn,		SHCMD("qocr") },
636
+	{ MODKEY,         			XK_F6,		spawn,		SHCMD("qocre") },
637
+	{ MODKEY,         			XK_F3,		spawn,		SHCMD("displayselect") },
638
+	{ MODKEY,         			XK_F4,		spawn,		SHCMD(TERMINAL2 " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
639
+  { MODKEY,         		  XK_F5,		spawn,		SHCMD("pavucontrol") },
640
+//	{ MODKEY,         			XK_F6,		spawn,		SHCMD("torwrap") },
641
+//	{ MODKEY,         			XK_F7,		spawn,		SHCMD("td-toggle") },
642
+//	{ MODKEY,         			XK_F8,		spawn,		SHCMD("mw -Y") },
643
+//	{ MODKEY,         			XK_F9,		spawn,		SHCMD("/usr/bin/st -e 'vfzf $custDir'") },
644
+//	{ 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`)") },
645
+//  { 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)") },
646
+	//{ MODKEY,         			XK_F12,		spawn,		SHCMD(TERMINAL " -e [ ! -d ${HOME}/SCRATCH ] && mkdir ${HOME}/SCRATCH >/dev/null 2>&1; ${TERMINAL} -e /usr/bin/lfp ${HOME}/SCRATCH") },
647
+	{ MODKEY,                	XK_space,	spawn,	    SHCMD(TERMINAL2 " -e /usr/bin/snip") },
648
+	{ MODKEY|ShiftMask,	XK_space,	zoom,	        {0} },
649
+	{ MODKEY|ShiftMask,	XK_space,	togglefloating,	{0} },
650
+
651
+	{ 0,				XK_Print,	spawn,		SHCMD("maim pic-full-$(date '+%y%m%d-%H%M-%S').png") },
652
+	{ ShiftMask,			XK_Print,	spawn,		SHCMD("maimpick") },
653
+	{ MODKEY,         			XK_Print,	spawn,		SHCMD("dmenurecord") },
654
+	{ MODKEY|ShiftMask,		XK_Print,	spawn,		SHCMD("dmenurecord kill") },
655
+	{ MODKEY,         			XK_Delete,	spawn,		SHCMD("dmenurecord kill") },
656
+	{ MODKEY,         			XK_Scroll_Lock,	spawn,		SHCMD("killall screenkey || screenkey &") },
657
+
658
+	{ 0, XF86XK_AudioMute,		spawn,		SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
659
+	{ 0, XF86XK_AudioRaiseVolume,	spawn,		SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)") },
660
+	{ 0, XF86XK_AudioLowerVolume,	spawn,		SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)") },
661
+	{ 0, XF86XK_AudioPrev,		spawn,		SHCMD("mpc prev") },
662
+	{ 0, XF86XK_AudioNext,		spawn,		SHCMD("mpc next") },
663
+	{ 0, XF86XK_AudioPause,		spawn,		SHCMD("mpc pause") },
664
+	{ 0, XF86XK_AudioPlay,		spawn,		SHCMD("mpc play") },
665
+	{ 0, XF86XK_AudioStop,		spawn,		SHCMD("mpc stop") },
666
+	{ 0, XF86XK_AudioRewind,	spawn,		SHCMD("mpc seek -10") },
667
+	{ 0, XF86XK_AudioForward,	spawn,		SHCMD("mpc seek +10") },
668
+	{ 0, XF86XK_AudioMedia,		spawn,		SHCMD(TERMINAL " -e ncmpcpp") },
669
+	{ 0, XF86XK_AudioMicMute,	spawn,		SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
670
+	{ 0, XF86XK_PowerOff,		spawn,		SHCMD("sysact") },
671
+	{ 0, XF86XK_Calculator,		spawn,		SHCMD(TERMINAL " -e bc -l") },
672
+	{ 0, XF86XK_Sleep,		spawn,		SHCMD("sudo -A zzz") },
673
+	{ 0, XF86XK_WWW,		spawn,		SHCMD("$BROWSER") },
674
+	{ 0, XF86XK_DOS,		spawn,		SHCMD(TERMINAL) },
675
+	{ 0, XF86XK_ScreenSaver,	spawn,		SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
676
+	{ 0, XF86XK_TaskPane,		spawn,		SHCMD(TERMINAL " -e top") },
677
+	{ 0, XF86XK_Mail,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
678
+	{ 0, XF86XK_MyComputer,		spawn,		SHCMD(TERMINAL " -e lf /") },
679
+	/* { 0, XF86XK_Battery,		spawn,		SHCMD("") }, */
680
+	{ 0, XF86XK_Launch1,		spawn,		SHCMD("xset dpms force off") },
681
+	{ 0, XF86XK_TouchpadToggle,	spawn,		SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
682
+	{ 0, XF86XK_TouchpadOff,	spawn,		SHCMD("synclient TouchpadOff=1") },
683
+	{ 0, XF86XK_TouchpadOn,		spawn,		SHCMD("synclient TouchpadOff=0") },
684
+	{ 0, XF86XK_MonBrightnessUp,	spawn,		SHCMD("xbacklight -inc 15") },
685
+	{ 0, XF86XK_MonBrightnessDown,	spawn,		SHCMD("xbacklight -dec 15") },
686
+
687
+	/* { MODKEY|Mod4Mask,              XK_h,      incrgaps,       {.i = +1 } }, */
688
+	/* { MODKEY|Mod4Mask,              XK_l,      incrgaps,       {.i = -1 } }, */
689
+	/* { MODKEY|Mod4Mask|ShiftMask,    XK_h,      incrogaps,      {.i = +1 } }, */
690
+	/* { MODKEY|Mod4Mask|ShiftMask,    XK_l,      incrogaps,      {.i = -1 } }, */
691
+	/* { MODKEY|Mod4Mask|ControlMask,  XK_h,      incrigaps,      {.i = +1 } }, */
692
+	/* { MODKEY|Mod4Mask|ControlMask,  XK_l,      incrigaps,      {.i = -1 } }, */
693
+	/* { MODKEY|Mod4Mask|ShiftMask,    XK_0,      defaultgaps,    {0} }, */
694
+	/* { MODKEY,                                XK_y,      incrihgaps,     {.i = +1 } }, */
695
+	/* { MODKEY,                                XK_o,      incrihgaps,     {.i = -1 } }, */
696
+	/* { MODKEY|ControlMask,           XK_y,      incrivgaps,     {.i = +1 } }, */
697
+	/* { MODKEY|ControlMask,           XK_o,      incrivgaps,     {.i = -1 } }, */
698
+	/* { MODKEY|Mod4Mask,              XK_y,      incrohgaps,     {.i = +1 } }, */
699
+	/* { MODKEY|Mod4Mask,              XK_o,      incrohgaps,     {.i = -1 } }, */
700
+	/* { MODKEY|ShiftMask,             XK_y,      incrovgaps,     {.i = +1 } }, */
701
+	/* { MODKEY|ShiftMask,             XK_o,      incrovgaps,     {.i = -1 } }, */
702
+
703
+};
704
+
705
 
706
 /* button definitions */
707
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
708
diff --git a/definitions.h b/definitions.h
709
new file mode 100644
710
index 0000000..9bdb2c4
711
--- /dev/null
712
+++ b/definitions.h
713
@@ -0,0 +1,13 @@
714
+
715
+#define TERMINAL "st"
716
+#define TERMCLASS "St"
717
+#define TERMINAL2 "alacritty"
718
+#define TERMCLASS2 "Alacritty"
719
+#define BROWSER "brave"
720
+#define MODKEY Mod4Mask
721
+#define ALTKEY Mod1Mask
722
+#define CTRLKEY ControlMask
723
+#define NOMOD 0
724
+
725
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
726
+
727
diff --git a/drw.o b/drw.o
728
index 18962a6..c6c5d3c 100644
729
Binary files a/drw.o and b/drw.o differ
730
diff --git a/keybindings.c b/keybindings.c
731
deleted file mode 100644
732
index 9665e25..0000000
733
--- a/keybindings.c
734
+++ /dev/null
735
@@ -1,225 +0,0 @@
736
-
737
-//---------------------------------------------------------- Constants ---------------------------------------------------------//
738
-
739
-//--------------------------------------------------------- Key Definitions -----------------------------------------------------//
740
-
741
-
742
-static Key keys[] = {
743
-	/* modifier                     key        function        argument */
744
-	STACKKEYS(MODKEY,                          focus)
745
-	STACKKEYS(ALTKEY,                          push)
746
-	STACKKEYS(MODKEY|ShiftMask,                push)
747
-	/* { MODKEY|ShiftMask,		XK_Escape,	spawn,	SHCMD("") }, */
748
-	{ MODKEY,         			XK_grave,	spawn,	SHCMD("dmenuunicode") },
749
-	/* { MODKEY|ShiftMask,		XK_grave,	togglescratch,	SHCMD("") }, */
750
-	TAGKEYS(			XK_1,		0)
751
-	TAGKEYS(			XK_2,		1)
752
-	TAGKEYS(			XK_3,		2)
753
-	TAGKEYS(			XK_4,		3)
754
-	TAGKEYS(			XK_5,		4)
755
-	TAGKEYS(			XK_6,		5)
756
-	TAGKEYS(			XK_7,		6)
757
-	TAGKEYS(			XK_8,		7)
758
-	TAGKEYS(  		XK_9,		8)
759
-
760
-  { MODKEY,             XK_F12,     spawn,		SHCMD("cpSecPass 1") },
761
-  { MODKEY,             XK_F11,     spawn,		SHCMD("cpSecPass 2") },
762
-  { MODKEY,             XK_F6,      spawn,		SHCMD("cpSecPass 3") },
763
-  { MODKEY,             XK_F7,      spawn,		SHCMD("cpSecPass 4") },
764
-  { MODKEY,             XK_F9,      spawn,		SHCMD("cpSecPass 5") },
765
-  { MODKEY,             XK_F10,     spawn,		SHCMD("cpSecPass 6") },
766
-  { ALTKEY|ShiftMask,   XK_F10,     spawn,		SHCMD("clipmenu") },
767
-  { MODKEY,             XK_F8,      spawn,		SHCMD("cpSecPass 7") },
768
-  { MODKEY,             XK_minus,	  spawn,		SHCMD("cpSecPass 8") },
769
-  { MODKEY,             XK_equal,	  spawn,		SHCMD("cpSecPass 9") },
770
-  { MODKEY,             XK_F13,     spawn,		SHCMD("cpSecPass 10") },
771
-
772
-
773
-  // Scratch Pads:
774
-
775
-	{ MODKEY,		XK_s,	 togglescratch, {.ui = 0 } },
776
-	{ ALTKEY,		XK_Return,  togglescratch, {.ui = 1 } },
777
-	{ MODKEY,		XK_backslash,	togglescratch, {.ui = 3 } },
778
-	{ MODKEY|ShiftMask,		XK_backslash,	togglescratch, {.ui = 4 } },
779
-	{ MODKEY|ControlMask, XK_period,  spawn, SHCMD(TERMINAL " -e job") },
780
-  { MODKEY,   XK_Escape,    spawn, SHCMD("startJustine") },
781
-	{ MODKEY,   XK_slash,	    spawn, SHCMD("startJustineSilent") },
782
-
783
-
784
-
785
-
786
-  { MODKEY,         			XK_0,		view,		{.ui = ~0 } },
787
-	{ MODKEY|ShiftMask,		XK_0,		tag,		{.ui = ~0 } },
788
-	{ MODKEY,         			XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") },
789
-//	{ MODKEY|ShiftMask,		XK_minus,	spawn,		SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") },
790
- // { MODKEY,         			XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") },
791
-	{ MODKEY|ShiftMask,		XK_equal,	spawn,		SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") },
792
-	{ MODKEY,         			XK_BackSpace,	spawn,		SHCMD("sysact") },
793
-	{ MODKEY|ShiftMask,		XK_BackSpace,	spawn,		SHCMD("sysact") },
794
-
795
-
796
-/*  { MODKEY|ShiftMask,        XK_a, scratchpad_show, {0} },
797
-	{ MODKEY|ShiftMask,        XK_s, scratchpad_hide, {0} },
798
-	{ MODKEY|ShiftMask|ALTKEY, XK_equal,scratchpad_remove,{0} },
799
-  */
800
-	{ MODKEY,         			XK_Tab,		view,		{0} },
801
-	/* { MODKEY|ShiftMask,		XK_Tab,		spawn,		SHCMD("") }, */
802
-	{ MODKEY,         			XK_q,		killclient,	{0} },
803
-	{ MODKEY|ShiftMask,		XK_q,		spawn,		SHCMD("sysact") },
804
-	{ MODKEY,         			XK_w,		spawn,		SHCMD("$BROWSER") },
805
-	{ MODKEY|ShiftMask,	XK_w,		spawn,		SHCMD("$BROWSER2") },
806
-  { MODKEY,                	XK_c,		spawn,		SHCMD("clipdl") },
807
-  { MODKEY|ShiftMask,       XK_c,		spawn,		SHCMD(TERMINAL2 " -e tdap") },
808
-  { CTRLKEY|ShiftMask,     XK_c,		spawn,		SHCMD("xdotool type '[email protected]'") },
809
-
810
-/*	{ MODKEYask,		XK_w,		spawn,		SHCMD(TERMINAL " -e sudo nmtui") }, */
811
-	{ MODKEY,         		XK_e,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },
812
-	{ MODKEY|ShiftMask,		XK_e,		spawn,		SHCMD("rofi -modi emoji -show emoji") },
813
-	{ MODKEY,         		XK_r,		spawn,		SHCMD(TERMINAL " -e gifcast -w -o ~/Media/SCREEN-REC/`dt - -t :`.mp4") },
814
-	{ MODKEY|ShiftMask,		XK_r,		spawn,		SHCMD(TERMINAL " -e htop") },
815
-	{ ALTKEY,         		XK_y,	  spawn,     SHCMD("youtube-music") },
816
-	{ MODKEY,         		XK_t,		setlayout,	{.v = &layouts[0]} }, /* tile */
817
-	{ MODKEY,		          XK_i,		setlayout,	{.v = &layouts[3]} }, /* dwindle */
818
-	{ MODKEY,         		XK_u,		setlayout,	{.v = &layouts[2]} }, /* deck */
819
-	{ MODKEY,         		XK_y,		setlayout,	{.v = &layouts[0]} }, /* centeredmaster */
820
-	{ MODKEY,         		XK_o,		setlayout,  {.v = &layouts[4]} },
821
-	{ MODKEY|ShiftMask,		XK_u,		setlayout,	{.v = &layouts[5]} }, /* monocle */
822
-	{ MODKEY|ShiftMask,		XK_i,		setlayout,	{.v = &layouts[7]} }, /* centeredfloatingmaster */
823
-	{ MODKEY|ShiftMask,		XK_t,		setlayout,	{.v = &layouts[1]} }, /* bstack */
824
-	{ MODKEY|ShiftMask,   XK_y,		setlayout,	{.v = &layouts[4]} }, /* spiral */
825
-	{ MODKEY,         		XK_p,		incnmaster,     {.i = +1 } },
826
-	{ MODKEY|ShiftMask,		XK_p,		incnmaster,     {.i = -1 } },
827
-/*	{ MODKEY,         			XK_p,		spawn,		SHCMD("mpc toggle") },
828
-	{ MODKEY|ShiftMask,	XK_p,		spawn,		SHCMD("mpc pause ; pauseallmpv") },*/
829
-
830
-    { MODKEY,         			XK_bracketleft,		spawn,		SHCMD("mpc seek -10") },
831
-	{ MODKEY|ShiftMask,	XK_bracketleft,		spawn,		SHCMD("mpc seek -60") },
832
-	{ MODKEY,         			XK_bracketright,	spawn,		SHCMD("mpc seek +10") },
833
-	{ MODKEY|ShiftMask,	XK_bracketright,	spawn,		SHCMD("mpc seek +60") },
834
-//	{ MODKEY,         			XK_backslash,		view,		{0} },
835
-	/* { MODKEY|ShiftMask,		XK_backslash,		spawn,		SHCMD("") }, */
836
-
837
-	{ MODKEY,         			XK_a,		togglegaps,	{0} },
838
-	{ MODKEY|ShiftMask,     XK_a,		defaultgaps,	{0} },
839
-//	{ MODKEY,         			XK_s,		togglesticky,	{0} },
840
-  { MODKEY|ShiftMask,		XK_s,		spawn,     SHCMD("gnome-screenshot -i") },
841
-	{ MODKEY,         			XK_d,		spawn,          SHCMD("rfi 33") },
842
-	{ MODKEY|ALTKEY,         			XK_d,		spawn,  SHCMD("rfi 40") },
843
-	{ MODKEY|ALTKEY,         		  XK_b,		spawn,		SHCMD("passmenu") },
844
-	{ MODKEY,               XK_f,		togglefullscr,	{0} },
845
-	{ MODKEY|ShiftMask,     XK_f,		setlayout,	{.v = &layouts[8]} },
846
-	{ MODKEY,               XK_g,		shiftview,	{ .i = -1 } },
847
-	{ MODKEY|ShiftMask,     XK_g,		shifttag,	{ .i = -1 } },
848
-	{ MODKEY,               XK_h,		setmfact,	{.f = -0.05} },
849
-	{ MODKEY,               XK_l,		setmfact,      	{.f = +0.05} },
850
-	{ MODKEY|ShiftMask,     XK_l,		spawn,    SHCMD("formdata") },
851
-  { CTRLKEY|ShiftMask,    XK_l,		spawn,    SHCMD("chlnk") },
852
-//	{ MODKEY,               XK_semicolon,	shiftview,	{ .i = 1 } },
853
-	{ MODKEY|ShiftMask,     XK_semicolon,	shifttag,	{ .i = 1 } },
854
-	{ ALTKEY|ShiftMask,     XK_p, spawn, SHCMD(TERMINAL " -e snipSnip&&notify-send '✅ Coppied from Clipboard'") },
855
-	{ ALTKEY|ShiftMask,     XK_o, spawn, SHCMD(TERMINAL " -e snipSnip -o&&notify-send '✅ Saved to Clipboard'") },
856
-	{ MODKEY,               XK_apostrophe,	togglescratch,	{.ui = 1} },
857
-	/* { MODKEY|ShiftMask,	XK_apostrophe,	spawn,		SHCMD("") }, */
858
-	{ MODKEY,               XK_Return,	spawn,		{.v = term2cmd } },
859
-	{ MODKEY,               XK_z,		incrgaps,	{.i = +3 } },
860
-	/* { MODKEY|ShiftMask,	XK_z,		spawn,		SHCMD("") }, */
861
-	{ MODKEY,               XK_x,		incrgaps,	{.i = -3 } },
862
-	/* { MODKEY|ShiftMask,	XK_x,		spawn,		SHCMD("") }, */
863
-	/* { MODKEY,         		XK_c,		spawn,		SHCMD("") }, */
864
-	/* { MODKEY|ShiftMask,	XK_c,		spawn,		SHCMD("") }, */
865
-	/* V is automatically bound above in STACKKEYS */
866
-	{ MODKEY,         			XK_b,		togglebar,	{0} },
867
-	{ MODKEY|ShiftMask,			XK_b,		spawn,    SHCMD("blueberry") },
868
-	/* { MODKEY|ShiftMask, 	XK_b,		spawn,		SHCMD("") }, */
869
-	{ MODKEY,         			XK_n,		spawn,		SHCMD(TERMINAL " -e vnote") },
870
-	{ MODKEY|ShiftMask,     XK_n,		spawn,		SHCMD(TERMINAL " -e [ ! -d $HOME/Documents ] && mkdir $HOME/Documents >/dev/null 2>&1; ${TERMINAL} -e nvim $HOME/Documents/notes") },
871
-  { ALTKEY,               XK_n,		spawn,		SHCMD(TERMINAL " -e nmon") },
872
-  { ALTKEY|ShiftMask,     XK_m,		spawn,		SHCMD(TERMINAL " -e htop") },
873
-	{ MODKEY,         			XK_m,		spawn,		SHCMD(TERMINAL " -e ncmpcpp") },
874
-
875
-	{ MODKEY|ShiftMask,     XK_m,		spawn,		SHCMD(TERMINAL " -e mpv `xclip -selection primary -o`") },
876
-	{ MODKEY,         			XK_comma,	spawn,		SHCMD("mpc prev") },
877
-	{ MODKEY|ShiftMask,     XK_comma,	spawn,		SHCMD("mpc seek 0%") },
878
-	{ MODKEY,         			XK_period,	spawn,		SHCMD(TERMINAL2 " -e qcopy -w") },
879
-	{ MODKEY|ShiftMask,     XK_period,	spawn,		SHCMD("mpc repeat") },
880
-
881
-	{ MODKEY,         			XK_Left,	focusmon,	{.i = -1 } },
882
-	{ MODKEY|ShiftMask,     XK_Left,	tagmon,		{.i = -1 } },
883
-	{ MODKEY,         			XK_Right,	focusmon,	{.i = +1 } },
884
-	{ MODKEY|ShiftMask,     XK_Right,	tagmon,		{.i = +1 } },
885
-
886
-	{ MODKEY,         			XK_Page_Up,	shiftview,	{ .i = -1 } },
887
-	{ MODKEY|ShiftMask,     XK_Page_Up,	shifttag,	{ .i = -1 } },
888
-	{ MODKEY,         			XK_Page_Down,	shiftview,	{ .i = +1 } },
889
-	{ MODKEY|ShiftMask,     XK_Page_Down,	shifttag,	{ .i = +1 } },
890
-	{ MODKEY,         			XK_Insert,	spawn,		SHCMD("xdotool type $(grep -v '^#' ~/.local/share/Nu1LL1nuX/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
891
-
892
-	{ MODKEY,         			XK_F2,		spawn,		SHCMD("flameshot gui") },
893
-	{ MODKEY,         			XK_F3,		spawn,		SHCMD("displayselect") },
894
-	{ MODKEY,         			XK_F4,		spawn,		SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
895
-  { MODKEY,         		  XK_F5,		spawn,		SHCMD("pavucontrol") },
896
-//	{ MODKEY,         			XK_F6,		spawn,		SHCMD("torwrap") },
897
-//	{ MODKEY,         			XK_F7,		spawn,		SHCMD("td-toggle") },
898
-//	{ MODKEY,         			XK_F8,		spawn,		SHCMD("mw -Y") },
899
-//	{ MODKEY,         			XK_F9,		spawn,		SHCMD("/usr/bin/st -e 'vfzf $custDir'") },
900
-//	{ 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`)") },
901
-//  { 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)") },
902
-	//{ MODKEY,         			XK_F12,		spawn,		SHCMD(TERMINAL " -e [ ! -d ${HOME}/SCRATCH ] && mkdir ${HOME}/SCRATCH >/dev/null 2>&1; ${TERMINAL} -e /usr/bin/lfp ${HOME}/SCRATCH") },
903
-	{ MODKEY,                	XK_space,	spawn,	    SHCMD(TERMINAL " -e /usr/bin/snip") },
904
-	{ MODKEY|ShiftMask,	XK_space,	zoom,	        {0} },
905
-	{ MODKEY|ShiftMask,	XK_space,	togglefloating,	{0} },
906
-
907
-	{ 0,				XK_Print,	spawn,		SHCMD("maim pic-full-$(date '+%y%m%d-%H%M-%S').png") },
908
-	{ ShiftMask,			XK_Print,	spawn,		SHCMD("maimpick") },
909
-	{ MODKEY,         			XK_Print,	spawn,		SHCMD("dmenurecord") },
910
-	{ MODKEY|ShiftMask,		XK_Print,	spawn,		SHCMD("dmenurecord kill") },
911
-	{ MODKEY,         			XK_Delete,	spawn,		SHCMD("dmenurecord kill") },
912
-	{ MODKEY,         			XK_Scroll_Lock,	spawn,		SHCMD("killall screenkey || screenkey &") },
913
-
914
-	{ 0, XF86XK_AudioMute,		spawn,		SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
915
-	{ 0, XF86XK_AudioRaiseVolume,	spawn,		SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)") },
916
-	{ 0, XF86XK_AudioLowerVolume,	spawn,		SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)") },
917
-	{ 0, XF86XK_AudioPrev,		spawn,		SHCMD("mpc prev") },
918
-	{ 0, XF86XK_AudioNext,		spawn,		SHCMD("mpc next") },
919
-	{ 0, XF86XK_AudioPause,		spawn,		SHCMD("mpc pause") },
920
-	{ 0, XF86XK_AudioPlay,		spawn,		SHCMD("mpc play") },
921
-	{ 0, XF86XK_AudioStop,		spawn,		SHCMD("mpc stop") },
922
-	{ 0, XF86XK_AudioRewind,	spawn,		SHCMD("mpc seek -10") },
923
-	{ 0, XF86XK_AudioForward,	spawn,		SHCMD("mpc seek +10") },
924
-	{ 0, XF86XK_AudioMedia,		spawn,		SHCMD(TERMINAL " -e ncmpcpp") },
925
-	{ 0, XF86XK_AudioMicMute,	spawn,		SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
926
-	{ 0, XF86XK_PowerOff,		spawn,		SHCMD("sysact") },
927
-	{ 0, XF86XK_Calculator,		spawn,		SHCMD(TERMINAL " -e bc -l") },
928
-	{ 0, XF86XK_Sleep,		spawn,		SHCMD("sudo -A zzz") },
929
-	{ 0, XF86XK_WWW,		spawn,		SHCMD("$BROWSER") },
930
-	{ 0, XF86XK_DOS,		spawn,		SHCMD(TERMINAL) },
931
-	{ 0, XF86XK_ScreenSaver,	spawn,		SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
932
-	{ 0, XF86XK_TaskPane,		spawn,		SHCMD(TERMINAL " -e htop") },
933
-	{ 0, XF86XK_Mail,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
934
-	{ 0, XF86XK_MyComputer,		spawn,		SHCMD(TERMINAL " -e lf /") },
935
-	/* { 0, XF86XK_Battery,		spawn,		SHCMD("") }, */
936
-	{ 0, XF86XK_Launch1,		spawn,		SHCMD("xset dpms force off") },
937
-	{ 0, XF86XK_TouchpadToggle,	spawn,		SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
938
-	{ 0, XF86XK_TouchpadOff,	spawn,		SHCMD("synclient TouchpadOff=1") },
939
-	{ 0, XF86XK_TouchpadOn,		spawn,		SHCMD("synclient TouchpadOff=0") },
940
-	{ 0, XF86XK_MonBrightnessUp,	spawn,		SHCMD("xbacklight -inc 15") },
941
-	{ 0, XF86XK_MonBrightnessDown,	spawn,		SHCMD("xbacklight -dec 15") },
942
-
943
-	/* { MODKEY|Mod4Mask,              XK_h,      incrgaps,       {.i = +1 } }, */
944
-	/* { MODKEY|Mod4Mask,              XK_l,      incrgaps,       {.i = -1 } }, */
945
-	/* { MODKEY|Mod4Mask|ShiftMask,    XK_h,      incrogaps,      {.i = +1 } }, */
946
-	/* { MODKEY|Mod4Mask|ShiftMask,    XK_l,      incrogaps,      {.i = -1 } }, */
947
-	/* { MODKEY|Mod4Mask|ControlMask,  XK_h,      incrigaps,      {.i = +1 } }, */
948
-	/* { MODKEY|Mod4Mask|ControlMask,  XK_l,      incrigaps,      {.i = -1 } }, */
949
-	/* { MODKEY|Mod4Mask|ShiftMask,    XK_0,      defaultgaps,    {0} }, */
950
-	/* { MODKEY,                                XK_y,      incrihgaps,     {.i = +1 } }, */
951
-	/* { MODKEY,                                XK_o,      incrihgaps,     {.i = -1 } }, */
952
-	/* { MODKEY|ControlMask,           XK_y,      incrivgaps,     {.i = +1 } }, */
953
-	/* { MODKEY|ControlMask,           XK_o,      incrivgaps,     {.i = -1 } }, */
954
-	/* { MODKEY|Mod4Mask,              XK_y,      incrohgaps,     {.i = +1 } }, */
955
-	/* { MODKEY|Mod4Mask,              XK_o,      incrohgaps,     {.i = -1 } }, */
956
-	/* { MODKEY|ShiftMask,             XK_y,      incrovgaps,     {.i = +1 } }, */
957
-	/* { MODKEY|ShiftMask,             XK_o,      incrovgaps,     {.i = -1 } }, */
958
-
959
-};
960
-
961
diff --git a/keybindings.h b/keybindings.h
962
deleted file mode 100644
963
index d36b991..0000000
964
--- a/keybindings.h
965
+++ /dev/null
966
@@ -1,247 +0,0 @@
967
-
968
-//--------------------------------------------------------- Key Definitions -----------------------------------------------------//
969
-
970
-
971
-#define TAGKEYS(KEY,         TAG) \
972
-	{ MODKEY,                       KEY,               view,           {.ui = 1 << TAG} }, \
973
-	{ ALTKEY,                       KEY,               tag,            {.ui = 1 << TAG} }, \
974
-	{ MODKEY|ControlMask,           KEY,               toggleview,     {.ui = 1 << TAG} }, \
975
-	{ MODKEY|ShiftMask,             KEY,               tag,            {.ui = 1 << TAG} }, \
976
-	{ MODKEY|ControlMask|ShiftMask, KEY,               toggletag,      {.ui = 1 << TAG} },
977
-#define STACKKEYS(MOD,ACTION) \
978
-	{ MOD,	XK_j,	        ACTION##stack,	{.i = INC(+1) } }, \
979
-	{ MOD,	XK_k,	        ACTION##stack,	{.i = INC(-1) } }, \
980
-	{ MOD,  XK_BackSpace, ACTION##stack, {.i = PREVSEL } }, \
981
-  { MOD,  XK_comma,    ACTION##stack,  {.i = 0 } }, \
982
-	{ MOD,  XK_Up,	    ACTION##stack,	{.i = INC(+1) } }, \
983
-	{ MOD,  XK_Down,	ACTION##stack,	{.i = INC(-1) } }, \
984
-	/* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */
985
-	/* { MOD, XK_a,     ACTION##stack, {.i = 1 } }, \ */
986
-	/* { MOD, XK_z,     ACTION##stack, {.i = 2 } }, \ */
987
-	/* { MOD, XK_x,     ACTION##stack, {.i = -1 } }, */
988
-
989
-/* helper for spawning shell commands in the pre AutoLinux-5.0 fashion */
990
-
991
-/* commands */
992
-static const char *termcmd[]   = { TERMINAL,  NULL };
993
-static const char *term2cmd[]   = { TERMINAL2,  NULL };
994
-
995
-
996
-static Key keys[] = {
997
-	/* modifier                     key        function        argument */
998
-	STACKKEYS(MODKEY,                          focus)
999
-	STACKKEYS(ALTKEY,                          push)