diff options
| author | Douglas Rumbaugh <doug@douglasrumbaugh.com> | 2021-12-19 22:02:46 -0500 |
|---|---|---|
| committer | Douglas Rumbaugh <doug@douglasrumbaugh.com> | 2021-12-19 22:02:46 -0500 |
| commit | a92bca0d79269f7597720014973fd570b1253b91 (patch) | |
| tree | a76525b9ea89e5b3e24f00c81ca7129eaf6d5d6b /config.def.h | |
| parent | b0dfc59433be19911aebee1450747ea879635619 (diff) | |
| download | dwm-a92bca0d79269f7597720014973fd570b1253b91.tar.gz | |
Merge cleanup and removed xresource for font
Seems using a fancy Nerdfont breaks things, so for now I'm
just not pulling in a font via Xresources
Diffstat (limited to 'config.def.h')
| -rw-r--r-- | config.def.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config.def.h b/config.def.h index 6f6a0d6..9598465 100644 --- a/config.def.h +++ b/config.def.h @@ -111,7 +111,7 @@ static const char *termcmd[] = { "st", NULL }; * Xresources preferences to load at startup */ ResourcePref resources[] = { - { "font", STRING, &font }, + //{ "font", STRING, &font }, { "dmenufont", STRING, &dmenufont }, { "normbgcolor", STRING, &normbgcolor }, { "normbordercolor", STRING, &normbordercolor }, @@ -188,13 +188,9 @@ 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 */ |