Change default terminal to alacritty

1 files changed, 86 insertions, 71 deletions

diff --git a/config.def.h b/config.def.h
index cd2f488..314fb96 100644
--- a/config.def.h
+++ b/config.def.h
@@ -38,12 +38,27 @@ typedef struct {
 	const void *cmd;
 } Sp;
 
+/*
+  Alacritty does not take the -g flag, so geometry has to be set differently. Example below:
+  const char *spcmd1[] = {"alacritty", "--class", "spaudio", "-o", "font.size=16", "-o", "font.normal.family=Fira Code Retina", "-o", "window.dimensions.columns=120", "-o", "window.dimensions.lines=35", "-e", "pulsemixer", NULL }; */
+const char *spcmd1[] = {"alacritty", "--class", "spaudio", "-o", "window.dimensions.columns=120", "-o", "window.dimensions.lines=35", "-e", "pulsemixer", NULL };
+const char *spcmd2[] = {"alacritty", "--class", "spnet",   "-o", "window.dimensions.columns=120", "-o", "window.dimensions.lines=35", "-e", "nmtui",      NULL };
+const char *spcmd3[] = {"alacritty", "--class", "spmp",    "-o", "window.dimensions.columns=120", "-o", "window.dimensions.lines=35", "-e", "ncmpcpp",    NULL };
+const char *spcmd4[] = {"alacritty", "--class", "spbt",    "-o", "window.dimensions.columns=120", "-o", "window.dimensions.lines=35", "-e", "tremc",      NULL };
+const char *spcmd5[] = {"alacritty", "--class", "spterm",  "-o", "window.dimensions.columns=120", "-o", "window.dimensions.lines=35", "-e", "tmux",       NULL };
+
+/*
+  St and other terminals which take a -g flag should take this format:
 const char *spcmd1[] = {"st", "-n", "spaudio", "-g", "120x35", "-e", "pulsemixer", NULL };
 const char *spcmd2[] = {"st", "-n", "spnet",   "-g", "80x40", "-e",  "nmtui",      NULL };
 const char *spcmd3[] = {"st", "-n", "spmp",    "-g", "120x35", "-e", "ncmpcpp",    NULL };
 const char *spcmd4[] = {"st", "-n", "spbt",    "-g", "120x35", "-e", "tremc",    NULL };
 const char *spcmd5[] = {"st", "-n", "spterm",  "-g", "120x35", "-e", "tmux",  NULL };
-/* const char *spcmd5[] = {"keepassxc", NULL }; */ 
+*/
+
+/*...and this is how to add  a gui app to a scratchpad
+  const char *spcmd5[] = {"keepassxc", NULL };
+*/
 
 static Sp scratchpads[] = {
 	/* name          cmd  */
@@ -51,8 +66,8 @@ static Sp scratchpads[] = {
 	{"spnet",        spcmd2},
 	{"spmp",         spcmd3},
 	{"spbt",         spcmd4},
-	{"spterm",       spcmd5},	
-/*	{"keepassxc",   spcmd3}, */
+	{"spterm",       spcmd5},
+  /*	{"keepassxc",   spcmd3}, */
 };
 
 static const char *const autostart[] = {
@@ -74,19 +89,19 @@ static const Rule rules[] = {
 	 *	WM_NAME(STRING) = title
 	 */
 
-	/* class              instance     title           tags mask  isfloating  isterminal  noswallow  monitor */
-	{ "Gimp",             NULL,        NULL,           0,         1,          0,           0,        -1 },
-	{ "Guake",            NULL,        NULL,           0,         1,          0,           0,        -1 },
-	{ "Firefox",          NULL,        NULL,           0,         0,          0,          -1,        -1 },
-	{ "terminator",       NULL,        NULL,           0,         0,          1,           0,        -1 },
-	{ "st",               NULL,        NULL,           0,         0,          1,           0,        -1 },
-	{ "Gnome-calculator", NULL,        "Calculator",   0,         1,          0,           0,        -1 }, 
-	{ NULL,	              "spaudio",   NULL,	   SPTAG(0),  1,          0,           0,        -1 },
-	{ NULL,	              "spnet",     NULL,	   SPTAG(1),  1,	  0,	       0,        -1 },
-	{ NULL,	              "spmp",      NULL,	   SPTAG(2),  1,	  0,	       0,        -1 },
-	{ NULL,	              "spbt",      NULL,	   SPTAG(3),  1,	  0,	       0,        -1 },
-	{ NULL,	              "spterm",    NULL,	   SPTAG(4),  1,	  0,	       0,        -1 },			
-	{ NULL,               NULL,        "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
+  /* class              instance     title           tags mask  isfloating  isterminal  noswallow  monitor */
+  { "Gimp",             NULL,        NULL,           0,         1,          0,           0,        -1 },
+  { "Guake",            NULL,        NULL,           0,         1,          0,           0,        -1 },
+  { "Firefox",          NULL,        NULL,           0,         0,          0,          -1,        -1 },
+  { "Alacritty",        NULL,        NULL,           0,         0,          1,           0,        -1 },
+  { "st",               NULL,        NULL,           0,         0,          1,           0,        -1 },
+  { "Gnome-calculator", NULL,        "Calculator",   0,         1,          0,           0,        -1 },
+  { NULL,               "spaudio",   NULL,     SPTAG(0),        1,          0,           0,        -1 },
+  { NULL,               "spnet",     NULL,     SPTAG(1),        1,          0,           0,        -1 },
+  { NULL,               "spmp",      NULL,     SPTAG(2),        1,          0,           0,        -1 },
+  { NULL,               "spbt",      NULL,     SPTAG(3),        1,          0,           0,        -1 },
+  { NULL,               "spterm",    NULL,     SPTAG(4),        1,          0,           0,        -1 },
+  { NULL,               NULL,        "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* layout(s) */
@@ -121,63 +136,63 @@ static const Layout layouts[] = {
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-static const char *termcmd[]  = { "st", NULL };
+static const char *termcmd[]  = { "alacritty", NULL };
 
 static Key keys[] = {
-	/* modifier                     key          				  function        argument */
-	{ MODKEY,                       XK_p,        	  spawn,          {.v = dmenucmd } },
-/*	{ MODKEY|ShiftMask,             XK_Return,   	  spawn,          {.v = termcmd } }, */
-	{ MODKEY|ShiftMask,             XK_Return,   	  togglescratch,    {.ui = 4 } },
-	{ MODKEY,                       XK_b,        	  togglebar,      {0} },
-	{ MODKEY,                       XK_j,        	  focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,        	  focusstack,     {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_j,       	  pushup,         {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_k,             pushdown,       {.i = -1 } },
-	{ MODKEY,                       XK_i,             incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_d,             incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,             setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,             setmfact,       {.f = +0.05} },
-	{ MODKEY,                       XK_Return,        zoom,           {0} },
-	{ MODKEY,                       XK_g,             center,         {0} },
-	{ MODKEY,                       XK_Tab,           view,           {0} },
-	{ MODKEY|ShiftMask,             XK_c,             killclient,     {0} },
-	{ MODKEY|ShiftMask,             XK_t,             setlayout,      {.v = &layouts[0]} }, /* { "[]=",      tile },   */
-	{ MODKEY|ShiftMask,             XK_f,             setlayout,      {.v = &layouts[1]} }, /* { "><>",      NULL },   */
-	{ MODKEY|ShiftMask,             XK_m,             setlayout,      {.v = &layouts[2]} }, /* { "[M]",      monocle }, */
-    { MODKEY|ShiftMask,             XK_u,      	      setlayout,      {.v = &layouts[3]} }, /* { "TTT",      bstack }, */
-/*  { MODKEY,                       XK_u,      	      setlayout,      {.v = &layouts[4]} }, */ /* { "===",      bstackhoriz }, */
-	{ MODKEY|ShiftMask,             XK_d,      	      setlayout,      {.v = &layouts[5]} }, /* { "[D]",      deck }, */
-	{ MODKEY|ShiftMask,             XK_i,             setlayout,      {.v = &layouts[6]} }, /* { "|M|",      centeredmaster }, */
-	{ MODKEY|ShiftMask,             XK_o,             setlayout,      {.v = &layouts[7]} },	/* { ">M>",      centeredfloatingmaster }, */
-	{ MODKEY,                       XK_space,  	      setlayout,      {0} },
-	{ MODKEY|ShiftMask,             XK_space,  	      togglefloating, {0} },
-	{ MODKEY,                       XK_0,      	      view,           {.ui = ~0 } },
-	{ MODKEY|ShiftMask,             XK_0,      	      tag,            {.ui = ~0 } },
-	{ MODKEY,                       XK_comma,  	      focusmon,       {.i = -1 } },
-	{ MODKEY,                       XK_period, 	      focusmon,       {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_comma,  	      tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, 	      tagmon,         {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_minus,  	      setborderpx,    {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_plus,   	      setborderpx,    {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_numbersign, 	  setborderpx,    {.i = 0 } },
-	{ MODKEY,                       XK_minus,  	      setgaps,        {.i = -5 } },
-	{ MODKEY,                       XK_equal,  	      setgaps,        {.i = +5 } },
-	{ MODKEY|ShiftMask,             XK_equal,  	      setgaps,        {.i = 0  } },
-	{ MODKEY,      		        XK_a,  	   	          togglescratch,  {.ui = 0 } },
-	{ MODKEY,            		XK_n,	   	          togglescratch,  {.ui = 1 } },
-	{ MODKEY,            		XK_slash,   	      togglescratch,  {.ui = 2 } },
-	{ MODKEY,                	XK_t,   	          togglescratch,  {.ui = 3 } },
-/*  { MODKEY,            		XK_b,   	          togglescratch,  {.ui = 4 } }, */
-	TAGKEYS(                        XK_1,                                    0)
-	TAGKEYS(                        XK_2,      		                 1)
-	TAGKEYS(                        XK_3,      		                 2)
-	TAGKEYS(                        XK_4,      		                 3)
-	TAGKEYS(                        XK_5,      		                 4)
-	TAGKEYS(                        XK_6,      		                 5)
-	TAGKEYS(                        XK_7,      		                 6)
-	TAGKEYS(                        XK_8,      		                 7)
-	TAGKEYS(                        XK_9,      		                 8)
-	{ MODKEY|ShiftMask,             XK_q,      	 quit,           {0} },
+  /* modifier             key             function        argument */
+  { MODKEY,               XK_p,           spawn,          {.v = dmenucmd } },
+/*  { MODKEY|ShiftMask,   XK_Return,      spawn,          {.v = termcmd } }, */
+  { MODKEY|ShiftMask,     XK_Return,      togglescratch,  {.ui = 4 } },
+  { MODKEY,               XK_b,           togglebar,      {0} },
+  { MODKEY,               XK_j,           focusstack,     {.i = +1 } },
+  { MODKEY,               XK_k,           focusstack,     {.i = -1 } },
+  { MODKEY|ShiftMask,     XK_j,           pushup,         {.i = +1 } },
+  { MODKEY|ShiftMask,     XK_k,           pushdown,       {.i = -1 } },
+  { MODKEY,               XK_i,           incnmaster,     {.i = +1 } },
+  { MODKEY,               XK_d,           incnmaster,     {.i = -1 } },
+  { MODKEY,               XK_h,           setmfact,       {.f = -0.05} },
+  { MODKEY,               XK_l,           setmfact,       {.f = +0.05} },
+  { MODKEY,               XK_Return,      zoom,           {0} },
+  { MODKEY,               XK_g,           center,         {0} },
+  { MODKEY,               XK_Tab,         view,           {0} },
+  { MODKEY|ShiftMask,     XK_c,           killclient,     {0} },
+  { MODKEY|ShiftMask,     XK_t,           setlayout,      {.v = &layouts[0]} }, /* { "[]=",      tile },   */
+  { MODKEY|ShiftMask,     XK_f,           setlayout,      {.v = &layouts[1]} }, /* { "><>",      NULL },   */
+  { MODKEY|ShiftMask,     XK_m,           setlayout,      {.v = &layouts[2]} }, /* { "[M]",      monocle }, */
+  { MODKEY|ShiftMask,     XK_u,           setlayout,      {.v = &layouts[3]} }, /* { "TTT",      bstack }, */
+/*  { MODKEY,               XK_u,         setlayout,      {.v = &layouts[4]} }, */ /* { "===",      bstackhoriz }, */
+  { MODKEY|ShiftMask,     XK_d,           setlayout,      {.v = &layouts[5]} }, /* { "[D]",      deck }, */
+  { MODKEY|ShiftMask,     XK_i,           setlayout,      {.v = &layouts[6]} }, /* { "|M|",      centeredmaster }, */
+  { MODKEY|ShiftMask,     XK_o,           setlayout,      {.v = &layouts[7]} }, /* { ">M>",      centeredfloatingmaster }, */
+  { MODKEY,               XK_space,       setlayout,      {0} },
+  { MODKEY|ShiftMask,     XK_space,       togglefloating, {0} },
+  { MODKEY,               XK_0,           view,           {.ui = ~0 } },
+  { MODKEY|ShiftMask,     XK_0,           tag,            {.ui = ~0 } },
+  { MODKEY,               XK_comma,       focusmon,       {.i = -1 } },
+  { MODKEY,               XK_period,      focusmon,       {.i = +1 } },
+  { MODKEY|ShiftMask,     XK_comma,       tagmon,         {.i = -1 } },
+  { MODKEY|ShiftMask,     XK_period,      tagmon,         {.i = +1 } },
+  { MODKEY|ShiftMask,     XK_minus,       setborderpx,    {.i = -1 } },
+  { MODKEY|ShiftMask,     XK_plus,        setborderpx,    {.i = +1 } },
+  { MODKEY|ShiftMask,     XK_numbersign,  setborderpx,    {.i = 0 } },
+  { MODKEY,               XK_minus,       setgaps,        {.i = -5 } },
+  { MODKEY,               XK_equal,       setgaps,        {.i = +5 } },
+  { MODKEY|ShiftMask,     XK_equal,       setgaps,        {.i = 0  } },
+  { MODKEY,               XK_a,           togglescratch,  {.ui = 0 } },
+  { MODKEY,               XK_n,           togglescratch,  {.ui = 1 } },
+  { MODKEY,               XK_slash,       togglescratch,  {.ui = 2 } },
+  { MODKEY,               XK_t,           togglescratch,  {.ui = 3 } },
+/*{ MODKEY,               XK_b,           togglescratch,  {.ui = 4 } }, */
+  TAGKEYS(                XK_1,                          0)
+  TAGKEYS(                XK_2,                          1)
+  TAGKEYS(                XK_3,                          2)
+  TAGKEYS(                XK_4,                          3)
+  TAGKEYS(                XK_5,                          4)
+  TAGKEYS(                XK_6,                          5)
+  TAGKEYS(                XK_7,                          6)
+  TAGKEYS(                XK_8,                          7)
+  TAGKEYS(                XK_9,                          8)
+  { MODKEY|ShiftMask,     XK_q,        quit,           {0} },
 };
 /* Button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */