From f4328ead13eb1406b1ae118f006bf74575663461 Mon Sep 17 00:00:00 2001 From: MrGeorgen Date: Mon, 31 Oct 2022 17:05:51 +0100 Subject: [PATCH] new config --- config.h | 26 +++++++++++++------------- config.mk | 2 +- dwm.c | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/config.h b/config.h index b42c9c7..383b722 100644 --- a/config.h +++ b/config.h @@ -21,7 +21,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "dc", "KP", "m", "g", "rss", "t", "w" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "dc", "KP", "m", "g", "mail", "t"}; static const Rule rules[] = { /* xprop(1): @@ -29,18 +29,17 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1 }, {"KeePassXC",NULL, NULL, 1 << 8, 0, -1}, {NULL, NULL, "newsboat", 1 << 11, 0, -1}, {NULL, NULL, "vimpc", 1 << 9, 0, -1}, {NULL, NULL, "Discord Updater",1 << 7, 0, -1}, {NULL, NULL, "Discord", 1 << 7, 0, -1}, + {"thunderbird", NULL, NULL, 1 << 11, 0, -1}, {"MultiMC5", NULL, NULL, 1 << 10, 0, -1}, {"Minecraft", "Minecraft", NULL, 1 << 10, 0, -1}, {NULL, NULL, "Steam", 1 << 10, 1, -1}, {"Steam", NULL, NULL, 1 << 10, 1, -1}, {"Microsoft Teams - Preview", NULL, NULL, 1 << 12, 0, -1}, - {"Rambox", NULL, NULL, 1 << 13, 0, -1}, }; /* layout(s) */ @@ -72,8 +71,7 @@ static const char *dmenucmd[] = { "dmenu", "-i", "-m", dmenumon, "-fn", dmenufon static char dmenucmdstr[256] = "--dmenu=\""; static const char *j4_dmenu_desktopcmd[] = {"j4-dmenu-desktop", dmenucmdstr, NULL}; static const char *termcmd[] = { "st", "-f", "Liberation Mono:size=10.5", NULL }; -static const char *firefoxcmd[] = {"firefox", NULL}; -static const char *sleepcmd[] = {"systemctl", "suspend", NULL}; +static const char *browsercmd[] = {"firefox", NULL}; static const char *shutdowncmd[] = {"systemctl", "poweroff", NULL}; static const char *lockcmd[] = {"loginctl", "lock-session", NULL}; static const char *rebootcmd[] = {"systemctl", "reboot", NULL}; @@ -82,15 +80,17 @@ static const char *mpcTogglecmd[] = {"mpc", "toggle", NULL}; static const char *mpcNextcmd[] = {"mpc", "next", NULL}; static const char *mpcPrevcmd[] = {"mpc", "prev", NULL}; static const char *mpcBegincmd[] = {"mpc", "seek", "0", NULL}; -static const char *droidcamTogglecmd[] = {"droidcamToggle", NULL}; +static const char *mpcLowerVolumecmd[] = {"mpc", "volume", "-5", NULL}; +static const char *mpcRaiseVolumecmd[] = {"mpc", "volume", "+5", NULL}; static const char *dummycmd[] = {"echo", "-n", NULL}; +static const char *mainSpeakercmd[] = {"main-speaker", NULL}; +static const char *soundbarcmd[] = {"pulse-sink", "alsa_output.pci-0000_28_00.1.hdmi-stereo-extra4"}; static Key keys[] = { /* modifier key function argument */ { MODKEY, XK_p, spawn, {.v = j4_dmenu_desktopcmd} }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_o, spawn, {.v = firefoxcmd} }, - { MODKEY|ShiftMask, XK_s, spawn, {.v = sleepcmd}}, + { MODKEY, XK_o, spawn, {.v = browsercmd} }, { MODKEY|ShiftMask, XK_h, spawn, {.v = shutdowncmd}}, { MODKEY|ShiftMask, XK_l, spawn, {.v = lockcmd}}, { MODKEY|ShiftMask, XK_r, spawn, {.v = rebootcmd}}, @@ -99,9 +99,10 @@ static Key keys[] = { { 0, XF86XK_AudioNext,spawn, {.v = mpcNextcmd}}, { 0, XF86XK_AudioPrev,spawn, {.v = mpcPrevcmd}}, { 0, XF86XK_AudioStop,spawn, {.v = mpcBegincmd}}, - { MODKEY, XK_x, spawn, {.v = droidcamTogglecmd}}, - { MODKEY, XK_odiaeresis, spawn, {.v = dummycmd}}, - { MODKEY, XK_m, spawn, {.v = dummycmd}}, + { 0, XF86XK_AudioLowerVolume,spawn,{.v = mpcLowerVolumecmd}}, + { 0, XF86XK_AudioRaiseVolume,spawn,{.v = mpcRaiseVolumecmd}}, + { MODKEY, XK_m, spawn, {.v = soundbarcmd}}, + { MODKEY, XK_n, spawn, {.v = mainSpeakercmd}}, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -111,7 +112,7 @@ static 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_c, killclient, {0} }, //{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, //{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, //{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, @@ -136,7 +137,6 @@ static Key keys[] = { TAGKEYS( XK_g, 10) TAGKEYS( XK_u, 11) TAGKEYS( XK_z, 12) - TAGKEYS( XK_a, 13) { MODKEY|ShiftMask, XK_q, quit, {0} }, }; diff --git a/config.mk b/config.mk index 7084c33..c02952c 100644 --- a/config.mk +++ b/config.mk @@ -27,7 +27,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} +CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -O2 ${INCS} ${CPPFLAGS} LDFLAGS = ${LIBS} # Solaris diff --git a/dwm.c b/dwm.c index b0b3466..fcd736b 100644 --- a/dwm.c +++ b/dwm.c @@ -2130,6 +2130,7 @@ zoom(const Arg *arg) int main(int argc, char *argv[]) { + config_start(); /* function in config.h */ if (argc == 2 && !strcmp("-v", argv[1])) die("dwm-"VERSION); else if (argc != 1)