restore config.h functionality
This commit is contained in:
parent
56b5a9f958
commit
d4d4a8caf9
2
Makefile
2
Makefile
|
@ -26,7 +26,7 @@ dwm: ${OBJ}
|
|||
${CC} -o $@ ${OBJ} ${LDFLAGS}
|
||||
|
||||
clean:
|
||||
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz config.h
|
||||
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
|
||||
|
||||
dist: clean
|
||||
mkdir -p dwm-${VERSION}
|
||||
|
|
23
config.def.h
23
config.def.h
|
@ -72,6 +72,21 @@ static char dmenumon[2] =
|
|||
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 *passmenucmd[] = {"passmenu", NULL};
|
||||
static const char *greenclip[] = {"rofi",
|
||||
"-theme",
|
||||
"solarized",
|
||||
"-font",
|
||||
"hack 11",
|
||||
"-modi",
|
||||
"clipboard:greenclip print",
|
||||
"-show",
|
||||
"clipboard",
|
||||
"-run-command",
|
||||
"'{cmd}'"};
|
||||
static const char *rofi_calc[] = {"rofi", "-theme", "solarized",
|
||||
"-font", "hack 11", "-show",
|
||||
"calc", "-no-show-match", "-no-sort"};
|
||||
static const char *termcmd[] = {"alacritty", NULL};
|
||||
|
||||
static const char *volmute[] = {"amixer", "-q", "set",
|
||||
|
@ -89,13 +104,19 @@ static const char *playplaypause[] = {"playerctl", "play-pause"};
|
|||
static const char *playnext[] = {"playerctl", "next"};
|
||||
static const char *playprev[] = {"playerctl", "previous"};
|
||||
|
||||
static const char *browser[] = {"brave", NULL};
|
||||
static const char *browser[] = {"firefox", NULL};
|
||||
|
||||
static const char *screenshot[] = {"flameshot", "gui", NULL};
|
||||
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{MODKEY, XK_u, spawn, {.v = dmenucmd}},
|
||||
{MODKEY, XK_p, spawn, {.v = passmenucmd}},
|
||||
{MODKEY | ShiftMask, XK_u, spawn, {.v = greenclip}},
|
||||
{MODKEY | ShiftMask, XK_a, spawn, {.v = rofi_calc}},
|
||||
{MODKEY, XK_Return, spawn, {.v = termcmd}},
|
||||
{MODKEY | ShiftMask, XK_s, spawn, {.v = lockcmd}},
|
||||
{MODKEY | ShiftMask, XK_d, spawn, {.v = screenshot}},
|
||||
{MODKEY, XK_b, togglebar, {0}},
|
||||
{MODKEY, XK_j, focusstack, {.i = +1}},
|
||||
{MODKEY, XK_k, focusstack, {.i = -1}},
|
||||
|
|
|
@ -0,0 +1,183 @@
|
|||
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <X11/XF86keysym.h>
|
||||
|
||||
/* appearance */
|
||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||
static const unsigned int gappx = 0; /* gaps between windows */
|
||||
static const unsigned int snap = 16; /* snap pixel */
|
||||
static const int showbar = 1; /* 0 means no bar */
|
||||
static const int topbar = 1; /* 0 means bottom bar */
|
||||
static const char *fonts[] = {"Anonymice Nerd Font:size=10"};
|
||||
static const char dmenufont[] = "Anonymice Nerd Font:size=10";
|
||||
static const char col_gray1[] = "#222222";
|
||||
static const char col_gray2[] = "#444444";
|
||||
static const char col_gray3[] = "#bbbbbb";
|
||||
static const char col_gray4[] = "#eeeeee";
|
||||
static const char col_cyan[] = "#005577";
|
||||
static const char *colors[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = {col_gray3, col_gray1, col_gray2},
|
||||
[SchemeSel] = {col_gray4, col_cyan, col_cyan},
|
||||
[SchemeHid] = {col_cyan, col_gray1, col_cyan},
|
||||
};
|
||||
|
||||
/* 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 isfloating monitor */
|
||||
{"Gimp", NULL, NULL, 0, 1, -1},
|
||||
{"Firefox", NULL, NULL, 1 << 8, 0, -1},
|
||||
};
|
||||
|
||||
/* layout(s) */
|
||||
static const float mfact = 0.55; /* 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 */
|
||||
{"[]=", tile}, /* first entry is default */
|
||||
{"><>", NULL}, /* no layout function means floating behavior */
|
||||
{"[M]", monocle},
|
||||
{"TTT", bstack},
|
||||
{"===", bstackhoriz},
|
||||
{"|M|", centeredmaster},
|
||||
{">M>", centeredfloatingmaster},
|
||||
};
|
||||
|
||||
/* 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", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1,
|
||||
"-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL};
|
||||
static const char *passmenucmd[] = {"passmenu", NULL};
|
||||
static const char *greenclip[] = {"rofi",
|
||||
"-theme",
|
||||
"solarized",
|
||||
"-font",
|
||||
"hack 11",
|
||||
"-modi",
|
||||
"clipboard:greenclip print",
|
||||
"-show",
|
||||
"clipboard",
|
||||
"-run-command",
|
||||
"'{cmd}'"};
|
||||
static const char *rofi_calc[] = {"rofi", "-theme", "solarized",
|
||||
"-font", "hack 11", "-show",
|
||||
"calc", "-no-show-match", "-no-sort"};
|
||||
static const char *termcmd[] = {"alacritty", NULL};
|
||||
|
||||
static const char *volmute[] = {"amixer", "-q", "set",
|
||||
"Master", "toggle", NULL};
|
||||
static const char *volup[] = {"amixer", "-q", "set", "Master",
|
||||
"5%+", "unmute", NULL};
|
||||
static const char *voldown[] = {"amixer", "-q", "set", "Master",
|
||||
"5%-", "unmute", NULL};
|
||||
|
||||
static const char *brupcmd[] = {"xbacklight", "-inc", "5%", NULL};
|
||||
static const char *brdowncmd[] = {"xbacklight", "-dec", "5%", NULL};
|
||||
static const char *lockcmd[] = {"slock", NULL};
|
||||
|
||||
static const char *playplaypause[] = {"playerctl", "play-pause"};
|
||||
static const char *playnext[] = {"playerctl", "next"};
|
||||
static const char *playprev[] = {"playerctl", "previous"};
|
||||
|
||||
static const char *browser[] = {"firefox", NULL};
|
||||
|
||||
static const char *screenshot[] = {"flameshot", "gui", NULL};
|
||||
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{MODKEY, XK_u, spawn, {.v = dmenucmd}},
|
||||
{MODKEY, XK_p, spawn, {.v = passmenucmd}},
|
||||
{MODKEY | ShiftMask, XK_u, spawn, {.v = greenclip}},
|
||||
{MODKEY | ShiftMask, XK_a, spawn, {.v = rofi_calc}},
|
||||
{MODKEY, XK_Return, spawn, {.v = termcmd}},
|
||||
{MODKEY | ShiftMask, XK_s, spawn, {.v = lockcmd}},
|
||||
{MODKEY | ShiftMask, XK_d, spawn, {.v = screenshot}},
|
||||
{MODKEY, XK_b, togglebar, {0}},
|
||||
{MODKEY, XK_j, focusstack, {.i = +1}},
|
||||
{MODKEY, XK_k, focusstack, {.i = -1}},
|
||||
{MODKEY, XK_greater, incnmaster, {.i = +1}},
|
||||
{MODKEY, XK_less, incnmaster, {.i = -1}},
|
||||
{MODKEY, XK_h, setmfact, {.f = -0.05}},
|
||||
{MODKEY, XK_l, setmfact, {.f = +0.05}},
|
||||
{MODKEY, XK_z, zoom, {0}},
|
||||
{MODKEY, XK_Tab, view, {0}},
|
||||
{MODKEY | ShiftMask, XK_c, killclient, {0}},
|
||||
{MODKEY, XK_t, setlayout, {.v = &layouts[0]}},
|
||||
{MODKEY, XK_f, setlayout, {.v = &layouts[1]}},
|
||||
{MODKEY, XK_m, setlayout, {.v = &layouts[2]}},
|
||||
{MODKEY, XK_y, setlayout, {.v = &layouts[3]}},
|
||||
{MODKEY | ShiftMask, XK_y, setlayout, {.v = &layouts[4]}},
|
||||
{MODKEY, XK_i, setlayout, {.v = &layouts[5]}},
|
||||
{MODKEY | ShiftMask, XK_i, setlayout, {.v = &layouts[6]}},
|
||||
{MODKEY, XK_space, setlayout, {0}},
|
||||
{MODKEY | ShiftMask, XK_space, togglefloating, {0}},
|
||||
{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, XK_minus, setgaps, {.i = -1}},
|
||||
{MODKEY, XK_equal, setgaps, {.i = +1}},
|
||||
{MODKEY | ShiftMask, XK_equal, setgaps, {.i = 0}},
|
||||
{MODKEY, XK_w, spawn, {.v = browser}},
|
||||
{MODKEY | ControlMask, XK_j, pushdown, {0}},
|
||||
{MODKEY | ControlMask, XK_k, pushup, {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){MODKEY | ShiftMask, XK_q, quit, {0}},
|
||||
{0, XF86XK_AudioRaiseVolume, spawn, {.v = volup}},
|
||||
{0, XF86XK_AudioLowerVolume, spawn, {.v = voldown}},
|
||||
{0, XF86XK_AudioMute, spawn, {.v = volmute}},
|
||||
{0, XF86XK_MonBrightnessUp, spawn, {.v = brupcmd}},
|
||||
{0, XF86XK_MonBrightnessDown, spawn, {.v = brdowncmd}},
|
||||
{0, XF86XK_AudioPlay, spawn, {.v = playplaypause}},
|
||||
{0, XF86XK_AudioNext, spawn, {.v = playnext}},
|
||||
{0, XF86XK_AudioPrev, spawn, {.v = playprev}},
|
||||
};
|
||||
|
||||
/* 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, Button1, togglewin, {0}},
|
||||
{ClkWinTitle, 0, Button2, zoom, {0}},
|
||||
{ClkStatusText, 0, Button2, spawn, {.v = termcmd}},
|
||||
{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}},
|
||||
};
|
||||
|
Loading…
Reference in New Issue