summaryrefslogtreecommitdiffstats
path: root/config.def.h
diff options
context:
space:
mode:
authorDouglas Rumbaugh <doug@douglasrumbaugh.com>2021-12-19 19:13:37 -0500
committerDouglas Rumbaugh <doug@douglasrumbaugh.com>2021-12-19 19:13:37 -0500
commitb0dfc59433be19911aebee1450747ea879635619 (patch)
tree254462776140091c33a8f47ae931fd676c286c1f /config.def.h
parent8388bc59ddc2c672d02ff265fb5a3fa7ea6c5228 (diff)
parentf3f6afbccfcef9630b05234006f933b47ce7ee89 (diff)
downloaddwm-b0dfc59433be19911aebee1450747ea879635619.tar.gz
Merge branch 'master' of github.com:dbrumbaugh/dwm
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/config.def.h b/config.def.h
index 266648a..6f6a0d6 100644
--- a/config.def.h
+++ b/config.def.h
@@ -173,6 +173,8 @@ static Key keys[] = {
{ MODKEY, XK_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
+ { MODKEY, XK_y, togglescratch, {.ui = 0 } },
+ { MODKEY, XK_u, togglescratch, {.ui = 1 } },
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2)
@@ -186,9 +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 */