commit 6e82734c2ebc0d97bc68fb80f7367efefb6d0385
parent 8a9aa42861807f647ff28eb25fd9f95ab7246ae2
Author: C. Beau Hilton <cbeauhilton@gmail.com>
Date: Wed, 2 Dec 2020 06:31:06 -0600
small cleanup, much remains
Diffstat:
| M | config.h | | | 46 | ++++++++++++++++++++++++---------------------- |
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/config.h b/config.h
@@ -8,10 +8,10 @@ static const unsigned int gappiv = 10; /* vert inner gap between window
static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */
static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
-static const int showbar = 1; /* 0 means no bar */
+static const int showbar = 0; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "IBM Plex Mono:pixelsize=12:antialias=true:autohint=true", "JoyPixels:pixelsize=10:antialias=true:autohint=true" };
-static char dmenufont[] = { "IBM Plex Mono:pixelsize=12:antialias=true:autohint=true", "JoyPixels:pixelsize=10:antialias=true:autohint=true" };
+static char dmenufont[] = "IBM Plex Mono:pixelsize=12:antialias=true:autohint=true";
static char normbgcolor[] = "#181818";
static char normbordercolor[] = "#181818";
static char normfgcolor[] = "#777777";
@@ -34,7 +34,7 @@ static const Rule rules[] = {
*/
/* class instance title tags mask isfloating isterminal noswallow monitor */
{ "Gimp", NULL, NULL, 1 << 8, 0, 0, 0, -1 },
- { "St", NULL, NULL, 0, 0, 1, 0, -1 },
+ { "kitty", NULL, NULL, 0, 0, 1, 0, -1 },
};
/* layout(s) */
@@ -82,10 +82,10 @@ 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", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[] = { "st", NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *termcmd[] = { "kitty", NULL };
static const char scratchpadname[] = "scratchpad";
-static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "120x34", NULL };
+static const char *scratchpadcmd[] = { "kitty", "-t", scratchpadname, "-g", "120x34", NULL };
#include <X11/XF86keysym.h>
#include "shiftview.c"
@@ -119,10 +119,10 @@ static Key keys[] = {
{ MODKEY, XK_q, killclient, {0} },
/* { MODKEY|ShiftMask, XK_q, spawn, SHCMD("") }, */
{ MODKEY, XK_w, spawn, SHCMD("$BROWSER") },
- { MODKEY|ShiftMask, XK_w, spawn, SHCMD("st -e sudo nmtui") },
- { MODKEY, XK_e, spawn, SHCMD("st -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },
+ { MODKEY|ShiftMask, XK_w, spawn, SHCMD("$TERMINAL -e sudo nmtui") },
+ { MODKEY, XK_e, spawn, SHCMD("$TERMINAL -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },
{ MODKEY|ShiftMask, XK_e, spawn, SHCMD("tutorialvids") },
- { MODKEY, XK_r, spawn, SHCMD("st -e lf") },
+ { MODKEY, XK_r, spawn, SHCMD("$TERMINAL -e nnn -e") },
/* { MODKEY|ShiftMask, XK_r, quit, {1} }, */
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} },
@@ -130,8 +130,9 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_u, setlayout, {.v = &layouts[4]} },
{ MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} },
- { MODKEY, XK_i, setlayout, {.v = &layouts[6]} },
- { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} },
+ { MODKEY, XK_i, spawn, SHCMD("$TERMINAL -e htop") },
+ /* { MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, */
+ /* { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, */
{ MODKEY, XK_o, incnmaster, {.i = +1 } },
{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } },
{ MODKEY, XK_p, spawn, SHCMD("mpc toggle") },
@@ -143,7 +144,7 @@ static Key keys[] = {
{ MODKEY, XK_backslash, view, {0} },
/* { MODKEY|ShiftMask, XK_backslash, spawn, SHCMD("") }, */
- { MODKEY, XK_a, spawn, SHCMD("st -e pulsemixer; kill -44 $(pidof dwmblocks)") },
+ { MODKEY, XK_a, spawn, SHCMD("$TERMINAL -e pulsemixer; kill -44 $(pidof dwmblocks)") },
/* { MODKEY|ShiftMask, XK_a, spawn, SHCMD("") }, */
{ MODKEY, XK_s, togglesticky, {0} },
/* { MODKEY|ShiftMask, XK_s, spawn, SHCMD("") }, */
@@ -167,15 +168,16 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_z, incrgaps, {.i = -1 } },
/* { MODKEY, XK_x, spawn, SHCMD("") }, */
/* { MODKEY|ShiftMask, XK_x, spawn, SHCMD("") }, */
- { MODKEY, XK_c, spawn, SHCMD("st -e bc -l") },
+ /* { MODKEY, XK_c, spawn, SHCMD("$TERMINAL -e bc -l") }, */
{ MODKEY|ShiftMask, XK_c, spawn, SHCMD("mpv --no-cache --no-osc --no-input-default-bindings --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },
- { MODKEY, XK_v, spawn, SHCMD("st -e $EDITOR -c \"VimwikiIndex\"") },
+ { MODKEY, XK_v, spawn, SHCMD("$TERMINAL -e $EDITOR $VIMWIKI_HOME") },
{ MODKEY|ShiftMask, XK_v, spawn, SHCMD("{ killall xcompmgr || setsid xcompmgr & } ; xwallpaper --zoom ~/.config/wall.png") },
{ MODKEY, XK_b, togglebar, {0} },
/* { MODKEY|ShiftMask, XK_b, spawn, SHCMD("") }, */
- { MODKEY, XK_n, spawn, SHCMD("st -e newsboat; pkill -RTMIN+6 dwmblocks") },
+ { MODKEY, XK_n, spawn, SHCMD("$TERMINAL -e nnn -e") },
+ { MODKEY|ShiftMask, XK_n, spawn, SHCMD("$TERMINAL -e newsboat; pkill -RTMIN+6 dwmblocks") },
/* { MODKEY|ShiftMask, XK_n, spawn, SHCMD("") }, */
- { MODKEY, XK_m, spawn, SHCMD("st -e ncmpcpp") },
+ { MODKEY, XK_m, spawn, SHCMD("$TERMINAL -e ncmpcpp") },
{ MODKEY|ShiftMask, XK_m, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
{ MODKEY, XK_comma, spawn, SHCMD("mpc prev") },
{ MODKEY|ShiftMask, XK_comma, spawn, SHCMD("mpc seek 0%") },
@@ -223,16 +225,16 @@ static Key keys[] = {
{ 0, XF86XK_AudioStop, spawn, SHCMD("mpc stop") },
{ 0, XF86XK_AudioRewind, spawn, SHCMD("mpc seek -10") },
{ 0, XF86XK_AudioForward, spawn, SHCMD("mpc seek +10") },
- { 0, XF86XK_AudioMedia, spawn, SHCMD("st -e ncmpcpp") },
+ { 0, XF86XK_AudioMedia, spawn, SHCMD("$TERMINAL -e ncmpcpp") },
{ 0, XF86XK_PowerOff, spawn, SHCMD("[ \"$(printf \"No\\nYes\" | dmenu -i -nb darkred -sb red -sf white -nf gray -p \"Shutdown computer?\")\" = Yes ] && sudo -A shutdown -h now") },
- { 0, XF86XK_Calculator, spawn, SHCMD("st -e bc -l") },
+ { 0, XF86XK_Calculator, spawn, SHCMD("$TERMINAL -e bc -l") },
{ 0, XF86XK_Sleep, spawn, SHCMD("sudo -A zzz") },
{ 0, XF86XK_WWW, spawn, SHCMD("$BROWSER") },
- { 0, XF86XK_DOS, spawn, SHCMD("st") },
+ { 0, XF86XK_DOS, spawn, SHCMD("$TERMINAL") },
{ 0, XF86XK_ScreenSaver, spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
- { 0, XF86XK_TaskPane, spawn, SHCMD("st -e htop") },
- { 0, XF86XK_Mail, spawn, SHCMD("st -e neomutt ; pkill -RTMIN+12 dwmblocks") },
- { 0, XF86XK_MyComputer, spawn, SHCMD("st -e lf /") },
+ { 0, XF86XK_TaskPane, spawn, SHCMD("$TERMINAL -e htop") },
+ { 0, XF86XK_Mail, spawn, SHCMD("$TERMINAL -e neomutt ; pkill -RTMIN+12 dwmblocks") },
+ { 0, XF86XK_MyComputer, spawn, SHCMD("$TERMINAL -e nnn /") },
/* { 0, XF86XK_Battery, spawn, SHCMD("") }, */
{ 0, XF86XK_Launch1, spawn, SHCMD("xset dpms force off") },
{ 0, XF86XK_TouchpadToggle, spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
