Use hyper instead of alt, remove bluetooth scratchpad

1 files changed, 43 insertions, 47 deletions

diff --git a/config.h b/config.h
index e532115..027154a 100644
--- a/config.h
+++ b/config.h
@@ -13,8 +13,8 @@ static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display
 static const int showsystray        = 1;     /* 0 means no systray */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "mononoki Nerd Font Mono:size=9", "JoyPixels:size=9" };
-static const char dmenufont[]       = "mononoki Nerd Font Mono:size=9";
+static const char *fonts[]          = { "mononoki Nerd Font Mono:size=10", "JoyPixels:size=9" };
+static const char dmenufont[]       = "mononoki Nerd Font Mono:size=10";
 static const char col_gray1[]       = "#222222";
 static const char col_gray2[]       = "#444444";
 static const char col_gray3[]       = "#bbbbbb";
@@ -33,18 +33,16 @@ typedef struct {
 const char *spcmd1[] = { "st", "-g", "150x50", "-c", "sphtop", "-e", "htop", NULL };
 const char *spcmd2[] = { "st", "-g", "150x50", "-c", "spterm", NULL };
 const char *spcmd3[] = { "st", "-g", "150x50", "-c", "sppm", "-e", "pulsemixer", NULL };
-const char *spcmd4[] = { "st", "-g", "150x50", "-c", "spbt", "-e", "bluetoothctl", NULL };
-const char *spcmd5[] = { "st", "-g", "150x50", "-c", "spncmp", "-e", "ncmpcpp", NULL };
-const char *spcmd6[] = { "st", "-g", "150x50", "-c", "spmutt", "-e", "neomutt", NULL };
-const char *spcmd7[] = { "st", "-g", "150x50", "-c", "spping", "-e", "ping", "1.1.1.1", NULL };
+const char *spcmd4[] = { "st", "-g", "150x50", "-c", "spncmp", "-e", "ncmpcpp", NULL };
+const char *spcmd5[] = { "st", "-g", "150x50", "-c", "spmutt", "-e", "neomutt", NULL };
+const char *spcmd6[] = { "st", "-g", "150x50", "-c", "spping", "-e", "ping", "1.1.1.1", NULL };
 static Sp scratchpads[] = {
   { "sphtop",     spcmd1 },
   { "spterm",     spcmd2 },
   { "sppm",       spcmd3 },
-  { "spbt",       spcmd4 },
-  { "spncmp",     spcmd5 },
-  { "spmutt",     spcmd6 },
-  { "spping",     spcmd7 },
+  { "spncmp",     spcmd4 },
+  { "spmutt",     spcmd5 },
+  { "spping",     spcmd6 },
 };
 
 /* tagging */
@@ -56,38 +54,37 @@ static const Rule rules[] = {
 	 *	WM_NAME(STRING) = title
 	 */
 	/* class     instance  title           tags mask  isfloating  isterminal  noswallow  monitor */
-        { NULL,      NULL,"Picture in picture", 511,    1,      0,      0,      -1 },
-        { "ardour-6.2.0",NULL,  NULL,           0,      1,      0,      0,      -1 },
-	{ "urxvt",	NULL,	NULL,		0,	0,	1,	0,	-1 },
-	{ "URxvt",	NULL,	NULL,		0,	0,	1,	0,	-1 },
-        { "Ardour-6.2.0",NULL,  NULL,           0,      1,      0,      0,      -1 },
-	{ "Gimp",       NULL,   NULL,           0,      1,      0,      0,      -1 },
-	{ "st-256color",NULL,   NULL,           0,      0,      1,      1,      -1 },
-	{ "st",		NULL,   NULL,           0,      0,      1,      1,      -1 },
-	{ "St",         NULL,   NULL,           0,      0,      1,      1,      -1 },
-        { "tabbed",	NULL,   NULL,           0,      0,      1,      0,      -1 },
-	{ NULL,     	NULL,   "abduco",       0,      0,      1,      0,      -1 },
-        { "Alacritty",  NULL,   NULL,           0,      0,      1,      0,      -1 },
-        { "Blueman",    NULL,   NULL,           0,      1,      0,      0,      -1 },
-        { "QjackCtl",	NULL,   NULL,           0,      1,      0,      0,      -1 },
-        { "qjackctl",	NULL,   NULL,           0,      1,      0,      0,      -1 },
-        { "catia.py",	NULL,   NULL,           0,      1,      0,      0,      -1 },
-        { "Catia",	NULL,   NULL,           0,      1,      0,      0,      -1 },
-        { NULL, 	"carla",NULL,           1 << 7, 1,      0,      0,      -1 },
-	{ NULL,		NULL,   "Event Tester", 0,      1,      0,      1,      -1 },
-        { "Steam",	NULL,   NULL,           4,      0,      0,      0,      -1 },
-        { "steam",	NULL,   NULL,           4,      0,      0,      0,      -1 },
-        { NULL,		NULL,   "steam",        4,      0,      0,      0,      -1 },
-        { "Lutris",	NULL,   NULL,           2,      0,      0,      0,      -1 },
-        { "lutris",	NULL,   NULL,           2,      0,      0,      0,      -1 },
-        { "sphtop",     NULL,   NULL,           SPTAG(0),1,     1,      1,      -1 },
-        { "spterm",     NULL,   NULL,           SPTAG(1),1,     1,      1,      -1 },
-        { "sppm",       NULL,   NULL,           SPTAG(2),1,     1,      1,      -1 },
-        { "spbt",       NULL,   NULL,           SPTAG(3),1,     1,      1,      -1 },
-        { "spncmp",     NULL,   NULL,           SPTAG(4),1,     1,      1,      -1 },
-        { "spmutt",     NULL,   NULL,           SPTAG(5),1,     1,      1,      -1 },
-        { "spping",     NULL,   NULL,           SPTAG(6),1,     1,      1,      -1 },
-        { NULL, "monero-wallet-gui",NULL,       256,    1,      0,      0,      -1 },
+        { NULL,      NULL,"Picture in picture", 511,      1,          0,          0,          -1 },
+        { "ardour-6.2.0",NULL,  NULL,           0,        1,          0,          0,          -1 },
+	{ "urxvt",	NULL,	NULL,		0,	  0,	      1,	  0,	      -1 },
+	{ "URxvt",	NULL,	NULL,		0,	  0,	      1,	  0,	      -1 },
+        { "Ardour-6.2.0",NULL,  NUL L,          0,        1,          0,          0,          -1 },
+	{ "Gimp",       NULL,   NUL L,          0,        1,          0,          0,          -1 },
+	{ "st-256color",NULL,   NULL,           0,        0,          1,          1,          -1 },
+	{ "st",		NULL,   NULL,           0,        0,          1,          1,          -1 },
+	{ "St",         NULL,   NULL,           0,        0,          1,          1,          -1 },
+        { "tabbed",	NULL,   NULL,           0,        0,          1,          0,          -1 },
+	{ NULL,     	NULL,   "abduco",       0,        0,          1,          0,          -1 },
+        { "Alacritty",  NULL,   NULL,           0,        0,          1,          0,          -1 },
+        { "Blueman",    NULL,   NULL,           0,        1,          0,          0,          -1 },
+        { "QjackCtl",	NULL,   NULL,           0,        1,          0,          0,          -1 },
+        { "qjackctl",	NULL,   NULL,           0,        1,          0,          0,          -1 },
+        { "catia.py",	NULL,   NULL,           0,        1,          0,          0,          -1 },
+        { "Catia",	NULL,   NULL,           0,        1,          0,          0,          -1 },
+        { NULL, 	"carla",NULL,           1 << 7,   1,          0,          0,          -1 },
+	{ NULL,		NULL,   "Event Tester", 0,        1,          0,          1,          -1 },
+        { "Steam",	NULL,   NULL,           4,        0,          0,          0,          -1 },
+        { "steam",	NULL,   NULL,           4,        0,          0,          0,          -1 },
+        { NULL,		NULL,   "steam",        4,        0,          0,          0,          -1 },
+        { "Lutris",	NULL,   NULL,           2,        0,          0,          0,          -1 },
+        { "lutris",	NULL,   NULL,           2,        0,          0,          0,          -1 },
+        { "sphtop",     NULL,   NULL,           SPTAG(0), 1,          1,          1,          -1 },
+        { "spterm",     NULL,   NULL,           SPTAG(1), 1,          1,          1,          -1 },
+        { "sppm",       NULL,   NULL,           SPTAG(2), 1,          1,          1,          -1 },
+        { "spncmp",     NULL,   NULL,           SPTAG(3), 1,          1,          1,          -1 },
+        { "spmutt",     NULL,   NULL,           SPTAG(4), 1,          1,          1,          -1 },
+        { "spping",     NULL,   NULL,           SPTAG(5), 1,          1,          1,          -1 },
+        { NULL, "monero-wallet-gui",NULL,       256,      1,          0,          0,          -1 },
 };
 
 /* layout(s) */
@@ -106,7 +103,7 @@ static const Layout layouts[] = {
 };
 
 /* key definitions */
-#define MODKEY Mod1Mask
+#define MODKEY Mod3Mask
 #define TAGKEYS(KEY,TAG) \
 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
@@ -149,10 +146,9 @@ static Key keys[] = {
         { MODKEY|ControlMask,           XK_z,       togglescratch,  {.ui = 0 } },
         { MODKEY|ControlMask,           XK_x,       togglescratch,  {.ui = 1 } },
         { MODKEY|ControlMask,           XK_c,       togglescratch,  {.ui = 2 } },
-        { MODKEY|ControlMask,           XK_v,       togglescratch,  {.ui = 3 } },
-        { MODKEY|ControlMask,           XK_b,       togglescratch,  {.ui = 4 } },
-        { MODKEY|ControlMask,           XK_a,       togglescratch,  {.ui = 5 } },
-        { MODKEY|ControlMask,           XK_s,       togglescratch,  {.ui = 6 } },
+        { MODKEY|ControlMask,           XK_b,       togglescratch,  {.ui = 3 } },
+        { MODKEY|ControlMask,           XK_a,       togglescratch,  {.ui = 4 } },
+        { MODKEY|ControlMask,           XK_s,       togglescratch,  {.ui = 5 } },
      	// { 0,                     XF86XK_AudioPlay,  spawn,          {.v = mpdtoggle } },
   	// { 0,                     XF86XK_AudioNext,  spawn,          {.v = mpdnext } },
   	// { 0,                     XF86XK_AudioPrev,  spawn,          {.v = mpdprev } },