diff --git a/README.md b/README.md index 0542743..36319e3 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ The list below shows the currently applied patches to the master branch. - dwm-noborder-6.2.diff (removes border if there is only one window) - dwm-pertag-20170513-ceac8c9.diff (allows having a layout/mwfact/barpos/nmaster per tag) - dwm-statuscmd-6.2.diff (enables dwmblocks compatibility) -- dwm-status2d-6.2.diff (enables drawing in statusbar) ## Hotkeys There are various shortcuts and hotkeys used in this version. Included in my build are the following. diff --git a/config.def.h b/config.def.h index c3423e7..2bc8121 100644 --- a/config.def.h +++ b/config.def.h @@ -14,7 +14,7 @@ static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#f7f7f7"; static const char col_gray4[] = "#000000"; -static const char col_cyan[] = "#a62238"; +static const char col_cyan[] = "#dddddd"; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, diff --git a/config.h b/config.h deleted file mode 100644 index ef13d20..0000000 --- a/config.h +++ /dev/null @@ -1,127 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* for media keys */ -#include - -/* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=10", "Noto Color Emoji:size=11" }; -static const char dmenufont[] = "monospace:size=10"; -static const char col_gray1[] = "#222222"; -static const char col_gray2[] = "#444444"; -static const unsigned int baralpha = 0xff; -static const unsigned int borderalpha = 0xff; -static const char col_gray3[] = "#f7f7f7"; -static const char col_gray4[] = "#000000"; -static const char col_cyan[] = "#a62238"; -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_gray3 }, -}; -static const unsigned int alphas[][3] = { - /* fg bg border */ - [SchemeNorm] = { OPAQUE, baralpha, borderalpha }, - [SchemeSel] = { OPAQUE, baralpha, borderalpha }, -}; - -/* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - -static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ - /* class instance title tags mask isCentered isfloating monitor */ - { "Gimp", NULL, NULL, 0, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, - { NULL, "de.uol.swp.client.ClientApp", NULL, 0, 0, 1, -1 }, -}; - -/* layout(s) */ -static const float mfact = 0.5; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ - -static const Layout layouts[] = { - /* symbol arrange function */ - { "[M]", monocle }, - { "[]=", tile }, /* first entry is default */ - { "[D]", deck }, - { "><>", NULL }, /* no layout function means floating behavior */ -}; - -/* key definitions */ -#define MODKEY Mod4Mask -#define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* commands */ -static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-c", "-l", "20", NULL }; - -static Key keys[] = { - /* modifier key function argument */ - { MODKEY|ShiftMask, XK_Escape, quit, {0} }, - { MODKEY|ShiftMask, XK_b, togglebar, {0} }, - { MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[2]} }, - { MODKEY|ShiftMask, XK_d, togglefloating, {0} }, - { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, - { MODKEY, XK_h, focusstack, {.i = -1 } }, - { MODKEY|ShiftMask, XK_h, zoom, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_j, zoom, {0} }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY|ShiftMask, XK_k, zoom, {0} }, - { MODKEY, XK_l, focusstack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[0]} }, - { MODKEY|ShiftMask, XK_o, setmfact, {.f = +0.05} }, - { MODKEY, XK_q, killclient, {0} }, - { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, - { MODKEY|ShiftMask, XK_z, setmfact, {.f = -0.05} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - //{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = +1 } }, - //{ MODKEY|ShiftMask, XK_z, incnmaster, {.i = -1 } }, - //{ MODKEY, XK_space, setlayout, {0} }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) -}; - -/* button definitions */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static Button buttons[] = { - /* click event mask button function argument */ - { ClkLtSymbol, 0, Button1, setlayout, {0} }, - { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, - { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, - { ClkTagBar, 0, Button1, view, {0} }, - { ClkTagBar, 0, Button3, toggleview, {0} }, - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, -}; -