From 3dbecabd16e631206bf6cfc8ea43c2f8386bb5cb Mon Sep 17 00:00:00 2001 From: Justin Gassner Date: Sat, 7 Oct 2017 21:29:25 +0200 Subject: config --- config.def.h | 31 ++++++++++++++++++++----------- config.mk | 10 +++++----- dwm.1 | 2 +- dwm.c | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/config.def.h b/config.def.h index 9efa774..cff3d04 100644 --- a/config.def.h +++ b/config.def.h @@ -5,8 +5,8 @@ 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" }; -static const char dmenufont[] = "monospace:size=10"; +static const char *fonts[] = { "DejaVuSansMono:size=12" }; +static const char dmenufont[] = "DejaVuSansMono:size=12"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -34,18 +34,18 @@ static const Rule rules[] = { /* 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 int resizehints = 0; /* 1 means respect size hints in tiled resizals */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ static const Layout layouts[] = { /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ + { "[M]", monocle }, /* first entry is default */ + { "[]=", tile }, { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, }; /* key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -62,7 +62,7 @@ static const char *termcmd[] = { "st", NULL }; static const Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY, XK_r, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, @@ -73,10 +73,10 @@ static const Key keys[] = { { MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_Return, 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_q, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, @@ -95,6 +95,15 @@ static const Key keys[] = { TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) { MODKEY|ShiftMask, XK_q, quit, {0} }, + { 0, 0x1008ff11,spawn, SHCMD("amixer set Master 5%-") }, + { 0, 0x1008ff12,spawn, SHCMD("amixer set Master toggle") }, + { 0, 0x1008ff13,spawn, SHCMD("amixer set Master 5%+") }, + { 0, 0x1008ff03,spawn, SHCMD("brightnessctl -q set 10%-") }, + { 0, 0x1008ff02,spawn, SHCMD("brightnessctl -q set +10%") }, + { MODKEY, XK_p, spawn, {.v = (const char*[]){ "passmenu", NULL } } }, + { MODKEY, XK_s, spawn, {.v = termcmd } }, + { MODKEY, XK_c, spawn, {.v = (const char*[]){ "chromium", NULL } } }, + { MODKEY, XK_o, spawn, {.v = (const char*[]){ "opendoc", NULL } } }, }; /* button definitions */ diff --git a/config.mk b/config.mk index 8efca9a..6921f80 100644 --- a/config.mk +++ b/config.mk @@ -4,11 +4,11 @@ VERSION = 6.5 # Customize below to fit your system # paths -PREFIX = /usr/local +PREFIX = /usr MANPREFIX = ${PREFIX}/share/man -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib +X11INC = /usr/include/X11 +X11LIB = /usr/lib/X11 # Xinerama, comment if you don't want it XINERAMALIBS = -lXinerama @@ -28,8 +28,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} -LDFLAGS = ${LIBS} +CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations ${INCS} ${CPPFLAGS} +LDFLAGS += ${LIBS} # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" diff --git a/dwm.1 b/dwm.1 index ddc8321..c81285d 100644 --- a/dwm.1 +++ b/dwm.1 @@ -60,7 +60,7 @@ click on a tag label adds/removes that tag to/from the focused window. Start .BR st(1). .TP -.B Mod1\-p +.B Mod1\-r Spawn .BR dmenu(1) for launching other programs. diff --git a/dwm.c b/dwm.c index f1d86b2..c057a8e 100644 --- a/dwm.c +++ b/dwm.c @@ -2006,7 +2006,7 @@ void updatestatus(void) { if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) - strcpy(stext, "dwm-"VERSION); + strcpy(stext, ""); drawbar(selmon); } -- cgit v1.2.3-54-g00ecf