terminal, scratchpad, and command changes

moving back to st for terminal

scratchpad changes:
- spterm leverages st
- removed spcalc
- added spmon
- renumbered scratchpads

command changes
- super + t launches termcmd (st)
- super + e launches editorcmd (emacsclient -c -a'')
- super + w launches browsercmd (firefox)
- super + x launches calccmd (gnome-calculator)
- made gnome-calculator floating

1 files changed, 24 insertions, 16 deletions

diff --git a/config.def.h b/config.def.h
index f437968..baf0ad3 100644
--- a/config.def.h
+++ b/config.def.h
@@ -41,27 +41,28 @@ typedef struct {
 /*
   Kitty does not take the -g flag, so geometry has to be set by
   overriding the config file settings. Example below:
-*/
 
 const char *spcmd1[] = {"kitty", "--class", "spaudio", "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "pulsemixer", NULL };
 const char *spcmd2[] = {"kitty", "--class", "spnet",   "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "nmtui",      NULL };
 const char *spcmd3[] = {"kitty", "--class", "spmp",    "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "ncmpcpp",    NULL };
 const char *spcmd4[] = {"kitty", "--class", "spbt",    "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "tremc",      NULL };
 const char *spcmd5[] = {"kitty", "--class", "spterm",  "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "tmux",       NULL };
-const char *spcmd6[] = {"kitty", "--class", "spcalc",  "-o", "initial_window_width=60c",  "-o", "initial_window_height=35c", "-e", "bc",  "-l",  NULL };
-const char *spcmd7[] = {"kitty", "--class", "spfm",    "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "ranger",     NULL };
+const char *spcmd6[] = {"kitty", "--class", "spfm",    "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "ranger",     NULL };
+const char *spcmd6[] = {"kitty", "--class", "spmon",   "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "gotop",     NULL };
 
+*/
 
 /*
-  St and other terminals which take a -g flag should take this format:
+  St and 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 *spcmd6[] = {"st", "-n", "spcalc",  "-g", "120x35", "-e", "bc",  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 *spcmd6[] = {"st", "-n", "spfm",    "-g", "120x35", "-e", "ranger",     NULL };
+const char *spcmd7[] = {"st", "-n", "spmon",   "-g", "120x35", "-e", "gotop",     NULL };
 
 /*...and this is how to add  a gui app to a scratchpad
   const char *spcmd5[] = {"keepassxc", NULL };
@@ -74,8 +75,8 @@ static Sp scratchpads[] = {
     {"spmp",    spcmd3},
     {"spbt",    spcmd4},
     {"spterm",  spcmd5},
-    {"spcalc",  spcmd6},
-    {"spfm",    spcmd7},
+    {"spfm",    spcmd6},
+    {"spmon",   spcmd7},
   /*	{"keepassxc",   spcmd3}, */
 };
 
@@ -97,7 +98,7 @@ static const Rule rules[] = {
 
   /* 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 },
+  { "gnome-calculator", NULL,        NULL,           0,         1,          0,           0,        -1 },
   { "Firefox",          NULL,        NULL,           0,         0,          0,          -1,        -1 },
   { "st",               NULL,        NULL,           0,         0,          1,           0,        -1 },
   { "kitty",            NULL,        NULL,           0,         0,          1,           0,        -1 },
@@ -107,8 +108,8 @@ static const Rule rules[] = {
   { NULL,               "spmp",      NULL,     SPTAG(2),        1,          0,           0,        -1 },
   { NULL,               "spbt",      NULL,     SPTAG(3),        1,          0,           0,        -1 },
   { NULL,               "spterm",    NULL,     SPTAG(4),        1,          1,           0,        -1 },
-  { NULL,               "spcalc",    NULL,     SPTAG(5),        1,          0,           0,        -1 },
-  { NULL,               "spfm",      NULL,     SPTAG(6),        1,          0,           0,        -1 },
+  { NULL,               "spfm",      NULL,     SPTAG(5),        1,          0,           0,        -1 },
+  { NULL,               "spmon",     NULL,     SPTAG(6),        1,          0,           0,        -1 },
   { NULL,               NULL,        "Event Tester", 0,         1,          0,           1,        -1 }, /* xev */
 };
 
@@ -144,12 +145,19 @@ 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[]  = { "kitty", NULL };
+
+static const char *termcmd[]  = { "st", NULL };
+static const char *editorcmd[]  = { "emacsclient", "-c", "-a''", NULL };
+static const char *browsercmd[]  = { "firefox", NULL };
+static const char *calccmd[]  = { "gnome-calculator", NULL };
 
 static Key keys[] = {
   /* modifier             key             function        argument */
   { MODKEY,               XK_p,           spawn,          {.v = dmenucmd } },
   { MODKEY,               XK_t,           spawn,          {.v = termcmd } },
+  { MODKEY,               XK_e,           spawn,          {.v = editorcmd } },
+  { MODKEY,               XK_w,           spawn,          {.v = browsercmd } },
+  { MODKEY,               XK_x,           spawn,          {.v = calccmd } },
   { MODKEY,               XK_b,           togglebar,      {0} },
   { MODKEY,               XK_j,           focusstack,     {.i = +1 } },
   { MODKEY,               XK_k,           focusstack,     {.i = -1 } },
@@ -190,8 +198,8 @@ static Key keys[] = {
   { MODKEY,               XK_slash,       togglescratch,  {.ui = 2 } },
   { MODKEY|ShiftMask,     XK_b,           togglescratch,  {.ui = 3 } },
   { MODKEY|ShiftMask,     XK_Return,      togglescratch,  {.ui = 4 } },
-  { MODKEY,               XK_x,           togglescratch,  {.ui = 5 } },
-  { MODKEY|ShiftMask,     XK_f,           togglescratch,  {.ui = 6 } },
+  { MODKEY,               XK_f,           togglescratch,  {.ui = 5 } },
+  { MODKEY,               XK_m,           togglescratch,  {.ui = 6 } },
   TAGKEYS(                XK_1,                           0)
   TAGKEYS(                XK_2,                           1)
   TAGKEYS(                XK_3,                           2)