diff options
Diffstat (limited to 'config.def.h')
| -rw-r--r-- | config.def.h | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/config.def.h b/config.def.h index 81fc9ff..4225cc9 100644 --- a/config.def.h +++ b/config.def.h @@ -38,31 +38,27 @@ typedef struct { const void *cmd; } Sp; -/* - 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", "spfm", "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "lf", NULL }; -const char *spcmd6[] = {"kitty", "--class", "spmon", "-o", "initial_window_width=120c", "-o", "initial_window_height=35c", "-e", "htop", NULL }; -*/ +const char *spcmd1[] = {"wezterm", "start", "--class", "spaudio", "-e", "mixertui", NULL }; +const char *spcmd2[] = {"wezterm", "start", "--class", "spmon", "-e", "htop", NULL }; +const char *spcmd3[] = {"wezterm", "start", "--class", "spmp", "-e", "ncmpcpp", NULL }; +const char *spcmd4[] = {"wezterm", "start", "--class", "spbt", "-e", "tremc", NULL }; +const char *spcmd5[] = {"wezterm", "start", "--class", "spterm", "-e", "tmux", NULL }; +const char *spcmd6[] = {"wezterm", "start", "--class", "spfm", "-e", "lf", NULL }; +const char *spcmd7[] = {"wezterm", "start", "--class", "spnet", "-e", "nmtui", NULL }; /* - St and terminals which take a -g flag should take this format: -*/ + St and Xterm take a -g flag: const char *spcmd1[] = {"st", "-n", "spaudio", "-g", "120x35", "-e", "mixertui", NULL }; -const char *spcmd2[] = {"st", "-n", "spnet", "-g", "80x40", "-e", "nmtui", NULL }; +const char *spcmd2[] = {"st", "-n", "spmon", "-g", "120x35", "-e", "htop", 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", "spfm", "-g", "120x35", "-e", "lf", NULL }; -const char *spcmd7[] = {"st", "-n", "spmon", "-g", "120x35", "-e", "htop", NULL }; +const char *spcmd7[] = {"st", "-n", "spnet", "-g", "80x40", "-e", "nmtui", NULL }; +*/ /*...and this is how to add a gui app to a scratchpad const char *spcmd5[] = {"keepassxc", NULL }; @@ -71,12 +67,12 @@ const char *spcmd7[] = {"st", "-n", "spmon", "-g", "120x35", "-e", "htop", static Sp scratchpads[] = { /* name cmd */ {"spaudio", spcmd1}, - {"spnet", spcmd2}, + {"spmon", spcmd2}, {"spmp", spcmd3}, {"spbt", spcmd4}, {"spterm", spcmd5}, {"spfm", spcmd6}, - {"spmon", spcmd7}, + {"spnet", spcmd7}, /* {"keepassxc", spcmd3}, */ }; @@ -102,8 +98,8 @@ static const Rule rules[] = { { "Alarm-clock-applet", 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 }, { "XTerm", NULL, NULL, 0, 0, 1, 0, -1 }, + { "wezterm", NULL, NULL, 0, 0, 1, 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 }, @@ -147,8 +143,8 @@ static const Layout layouts[] = { 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 *editorcmd[] = { "emacs", NULL }; +static const char *termcmd[] = { "wezterm", NULL }; +static const char *editorcmd[] = { "em", NULL }; static const char *browsercmd[] = { "firefox", NULL }; static const char *calccmd[] = { "gnome-calculator", NULL }; @@ -195,12 +191,12 @@ static Key keys[] = { { 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_m, togglescratch, {.ui = 1 } }, { MODKEY, XK_slash, togglescratch, {.ui = 2 } }, { MODKEY|ShiftMask, XK_b, togglescratch, {.ui = 3 } }, { MODKEY|ShiftMask, XK_Return, togglescratch, {.ui = 4 } }, { MODKEY, XK_f, togglescratch, {.ui = 5 } }, - { MODKEY, XK_m, togglescratch, {.ui = 6 } }, + { MODKEY, XK_n, togglescratch, {.ui = 6 } }, TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) |