restructured keybindings for new system

1 files changed, 50 insertions, 18 deletions

diff --git a/config.def.h b/config.def.h
index e44f121..657e291 100644
--- a/config.def.h
+++ b/config.def.h
@@ -100,6 +100,8 @@ static const Rule rules[] = {
 	/* class     instance  		title           tags mask  isfloating  isterminal  noswallow  monitor */
 	{ "Kitty",      NULL,     		NULL,           0,         0,          1,           0,        -1 },
 	{ NULL,      "kitty",     		NULL,		   	0,         0,          1,           0,        -1 },
+	{ "St",      NULL,     		NULL,           0,         0,          1,           0,        -1 },
+	{ NULL,      "st",     		NULL,		   	0,         0,          1,           0,        -1 },
 	{ NULL,      NULL,     		"Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 	{ NULL,      NULL,     		"zoom",                0,  1,          0,           0,        -1 }, /* xev */
 	{ NULL,		 "spcalc",		NULL,			SPTAG(0),  1,		   1,           0,        -1 },
@@ -151,11 +153,43 @@ static const Layout layouts[] = {
 #define SHCMD(cmd) { .v = (const char*[]){ "sh", "-c", cmd, NULL } }
 
 #define STATUSBAR "dwmblocks"
+/* default applications for keybindings */
+#define D_TERM "st"
+#define D_BROWSER "vimb"
+
+/* default directories */
+#define DATA_HOME "/home/douglas/.local/share/"
+#define CONFIG_HOME "/home/douglas/.config/"
+#define CACHE_HOME "/home/douglas/.cache/"
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[]  = { "kitty", NULL };
+static const char *termcmd[]  = { "tabbed", "-c", "-n", "tabbed_st", "-r", "2", D_TERM, "-w", "''", NULL}; //"''", "-e", "tmux", "-u", NULL };
+static const char *termcmd_tmux[]  = { "tabbed", "-c", "-n", "tabbed_st", "-r", "2", D_TERM, "-w", "''", "-e", "tmux", "-u", NULL };
+
+static const char *browsercmd1[] = {"tabbed", "-c", D_BROWSER, "-e", NULL};
+static const char *browsercmd2[] = {"qutebrowser", NULL};
+
+static const char *vpncmd1[] = { "vpn-connect", NULL};
+
+static const char *screenshotcmd1[] = {"maim", "-sl",  "-c",  ".27,.5214,.5333,.8",  "~/pictures/screenshots/$(date +%s).png", NULL};
+static const char *screenshotcmd2[] = {"maim", "~/pictures/screenshots/$(date +%s).png", NULL};
+
+/* volume control commands */
+static const char *sndoutput_up[]     = {"pamixer", "--allow-boost", "-i3;", "kill", "-44", "$(pidof dwmblocks)", NULL};
+static const char *sndoutput_down[]   = {"pamixer", "--allow-boost", "-d3;", "kill", "-44", "$(pidof dwmblocks)", NULL};
+static const char *sndoutput_mute[]   = {"pamixer", "-t;", "kill", "-44", "$(pidof dwmblocks)", NULL};
+
+static const char *sndinput_up[]     = {"pamixer", "--default-source", "-i3;", "kill", "-44", "$(pidof dwmblocks)", NULL};
+static const char *sndinput_down[]   = {"pamixer", "--default-source", "-d3;", "kill", "-44", "$(pidof dwmblocks)", NULL};
+static const char *sndinput_mute[]   = {"pamixer", "--default-source", "-t;", "kill", "-44", "$(pidof dwmblocks)", NULL};
+
+/* feed reader */
+static const char *readercmd[] = { D_TERM, "newsboat", "-u", DATA_HOME "feeds" 
+                                                     , "-c", CACHE_HOME "newsboat/cache"
+                                                     , "-C", CONFIG_HOME "newsboat/config"
+                                                     , NULL };
 
 /*
  * Xresources preferences to load at startup
@@ -195,8 +229,6 @@ ResourcePref resources[] = {
         { "color15",             STRING,  &termcol15},
 };
 
-static const char *vpn_launch[] = { "vpn-connect", "ARGUMENTS", NULL};
-
 #include <X11/XF86keysym.h>
 #include "movestack.c"
 static Key keys[] = {
@@ -205,10 +237,10 @@ static Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,    		            XK_Return, spawn,          {.v = termcmd } },
 
-	{ 0,    		                XK_Print,  spawn,          SHCMD("maim -sl -c .27,.5214,.5333,.8 ~/pictures/screenshots/$(date +%s).png") },
-	{ 0|ShiftMask,                  XK_Print,  spawn,          SHCMD("maim ~/pictures/screenshots/$(date +%s).png") },
+	{ 0,    		                XK_Print,  spawn,          {.v=screenshotcmd1}},
+	{ 0|ShiftMask,                  XK_Print,  spawn,          {.v=screenshotcmd2}},
 
-	{ MODKEY,    		            XK_Home, spawn,            {.v = vpn_launch} },
+	{ MODKEY,    		            XK_Home, spawn,            {.v = vpncmd1} },
 	//{ MODKEY,    		            XK_Prior, spawn,          {.v = termcmd } },
 	//{ MODKEY,    		            XK_Next, spawn,          {.v = termcmd } },
 	//{ MODKEY,    		            XK_End, spawn,          {.v = termcmd } },
@@ -288,9 +320,9 @@ static Key keys[] = {
     
 
     /* A - L */
-    { MODKEY,                       XK_a,      spawn,          SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)")  },
-    { MODKEY,                       XK_s,      spawn,          SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)")  },
-    { MODKEY,                       XK_d,      spawn,          SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)")  },
+    { MODKEY,                       XK_a,      spawn,          {.v=sndoutput_down}},
+    { MODKEY,                       XK_s,      spawn,          {.v=sndoutput_mute}},
+    { MODKEY,                       XK_d,      spawn,          {.v=sndoutput_up}},
     //{ MODKEY,                     XK_f,      <stuff>         {} },
     //{ MODKEY,                     XK_g,      <stuff>         {} },
 	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
@@ -301,9 +333,9 @@ static Key keys[] = {
 	{ MODKEY,                     XK_apostrophe,     spawn,       SHCMD("search") },
 
     /* Shift with A - L */
-    { MODKEY|ShiftMask,             XK_a,      spawn,          SHCMD("pamixer --default-source -d 3; kill -44 $(pidof dwmblocks)")  },
-    { MODKEY|ShiftMask,             XK_s,      spawn,          SHCMD("pamixer --default-source -t; kill -44 $(pidof dwmblocks)")  },
-    { MODKEY|ShiftMask,             XK_d,      spawn,          SHCMD("pamixer --default-source -i 3; kill -44 $(pidof dwmblocks)")  },
+    { MODKEY|ShiftMask,             XK_a,      spawn,          {.v=sndinput_down}},
+    { MODKEY|ShiftMask,             XK_s,      spawn,          {.v=sndinput_mute}},
+    { MODKEY|ShiftMask,             XK_d,      spawn,          {.v=sndinput_up}},
     //{ MODKEY|ShiftMask,           XK_f,      <stuff>         {} },
     //{ MODKEY|ShiftMask,           XK_g,      <stuff>         {} },
     //{ MODKEY|ShiftMask,           XK_h,      <stuff>         {} },
@@ -341,11 +373,11 @@ static Key keys[] = {
 
     /* Function Keys */
     { MODKEY,                       XK_Escape, spawn,           SHCMD("lock")},
-    { MODKEY,                       XK_F1,     spawn,           SHCMD("qutebrowser")},
-    { MODKEY,                       XK_F2,     spawn,           SHCMD("kitty neomutt")},
-    { MODKEY,                       XK_F3,     spawn,           SHCMD("pkill newsboat; kitty newsboat -u /export/home/dbr4/.local/share/feeds -c /export/home/dbr4/.cache/newsboat/cache -C /export/home/dbr4/.config/newsboat/config")},
-    { MODKEY,                       XK_F4,     spawn,           SHCMD("kitty khal interactive")},
-    { MODKEY,                       XK_F5,     spawn,           SHCMD("kitty weechat")},
+    { MODKEY,                       XK_F1,     spawn,           {.v = browsercmd1 }},
+    { MODKEY,                       XK_F2,     spawn,           SHCMD(D_TERM " neomutt")},
+    { MODKEY,                       XK_F3,     spawn,           {.v = readercmd }},
+    { MODKEY,                       XK_F4,     spawn,           SHCMD(D_TERM " khal interactive")},
+    { MODKEY,                       XK_F5,     spawn,           SHCMD(D_TERM " weechat")},
     { MODKEY,                       XK_F6,     spawn,           SHCMD("")},
 	{ MODKEY,            			XK_F7,     togglescratch,  {.ui = 5 } },
 	{ MODKEY,            			XK_F8,     togglescratch,  {.ui = 4 } },
@@ -357,7 +389,7 @@ static Key keys[] = {
 
     /* Shift with Function Keys */
     { MODKEY|ShiftMask,             XK_Escape, spawn,           SHCMD("toggle-lock")},
-    //{ MODKEY|ShiftMask,                       XK_F1,     spawn,           SHCMD("qutebrowser")},
+    { MODKEY|ShiftMask,                       XK_F1,     spawn,           {.v = browsercmd2}},
     //{ MODKEY|ShiftMask,                       XK_F2,     spawn,           SHCMD("kitty neomutt")},
     //{ MODKEY|ShiftMask,                       XK_F3,     spawn,           SHCMD("kitty newsboat -u /home/douglas/.local/share/feeds -c /home/douglas/.cache/newsboat/cache -C /home/douglas/.config/newsboat/config")},
     //{ MODKEY|ShiftMask,                       XK_F4,     spawn,           SHCMD("kitty khal interactive")},