summaryrefslogtreecommitdiffstats
path: root/config.def.h
diff options
context:
space:
mode:
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/config.def.h b/config.def.h
index 408fc25..6f6a0d6 100644
--- a/config.def.h
+++ b/config.def.h
@@ -36,10 +36,12 @@ typedef struct {
const char *spcmd1[] = {"st", "-n", "spcalc", "-g", "144x41", "-e", "calc", NULL };
const char *spcmd2[] = {"st", "-n", "spterm", "-g", "120x34", NULL };
+const char *spcmd3[] = {"st", "-n", "spnvim", "-g", "144x41", "-e", "nvim", NULL };
static Sp scratchpads[] = {
/* name cmd */
{"spcalc", spcmd1},
{"spterm", spcmd2},
+ {"spnvim", spcmd3},
};
/* tagging */
@@ -58,6 +60,7 @@ static const Rule rules[] = {
{ NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
{ NULL, "spcalc", NULL, SPTAG(0), 1, 1, 0, -1 },
{ NULL, "spterm", NULL, SPTAG(1), 1, 1, 0, -1 },
+ { NULL, "spnvim", NULL, SPTAG(2), 1, 1, 0, -1 },
};
/* layout(s) */
@@ -133,8 +136,8 @@ static Key keys[] = {
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
- { MODKEY, XK_p, incnmaster, {.i = -1 } },
+ { MODKEY, XK_equal, incnmaster, {.i = +1 } },
+ { MODKEY, XK_minus, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY, XK_space, zoom, {0} },
@@ -185,7 +188,13 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_r, quit, {1} },
/* Application Launching Hotkeys */
+<<<<<<< HEAD
+ { MODKEY, XK_y, togglescratch, {.ui = 0 } },
+ { MODKEY, XK_u, togglescratch, {.ui = 1 } },
+ { MODKEY, XK_i, togglescratch, {.ui = 2 } },
+=======
//{MODKEY XK_c }
+>>>>>>> f3f6afbccfcef9630b05234006f933b47ce7ee89
};
/* button definitions */