diff options
| -rw-r--r-- | config.def.h | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/config.def.h b/config.def.h index 38952c5..48813f2 100644 --- a/config.def.h +++ b/config.def.h @@ -39,39 +39,43 @@ typedef struct { } 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 }; -const char *spcmd6[] = {"alacritty", "--class", "spcalc", "-o", "window.dimensions.columns=60", "-o", "window.dimensions.lines=35", "-e", "bc", "-l", NULL } + 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 }; + + /* 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 *spcmd6[] = {"st", "-n", "spcalc", "-g", "120x35", "-e", "bc", NULL }; - +*/ /*...and this is how to add a gui app to a scratchpad const char *spcmd5[] = {"keepassxc", NULL }; */ static Sp scratchpads[] = { - /* name cmd */ - {"spaudio", spcmd1}, - {"spnet", spcmd2}, - {"spmp", spcmd3}, - {"spbt", spcmd4}, - {"spterm", spcmd5}, - {"spcalc", spcmd6}, + /* name cmd */ + {"spaudio", spcmd1}, + {"spnet", spcmd2}, + {"spmp", spcmd3}, + {"spbt", spcmd4}, + {"spterm", spcmd5}, + {"spcalc", spcmd6}, + {"spfm", spcmd7}, /* {"keepassxc", spcmd3}, */ }; @@ -95,8 +99,8 @@ static const Rule rules[] = { { "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 }, + { "kitty", NULL, NULL, 0, 0, 1, 0, -1 }, { "XTerm", 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 }, @@ -104,7 +108,8 @@ static const Rule rules[] = { { 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, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ + { NULL, "spfm", NULL, SPTAG(6), 1, 0, 0, -1 }, + { NULL, NULL, "Event Tester", 0, 1, 0, 1, -1 }, /* xev */ }; /* layout(s) */ @@ -139,7 +144,7 @@ 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[] = { "kitty", NULL }; static Key keys[] = { /* modifier key function argument */ @@ -186,6 +191,7 @@ static Key keys[] = { { 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 } }, TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) |