From a7b4e9aeafa1fc023792a38c3ea838496d1e23b6 Mon Sep 17 00:00:00 2001 From: Fr1nge Date: Sat, 1 Jan 2022 19:50:13 +0100 Subject: [PATCH] Updated dwm and config --- .config/X11/xinitrc | 2 +- .config/config.env.default | 1 + .local/src/dwm/config.mk | 2 +- .local/src/dwm/keybinds.h | 10 ++++++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index bc2a9dd8..5a6ff250 100755 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -40,8 +40,8 @@ while true; do if [ $restarted = 0 ]; then restarted=1 - echo "Restarting DWM" else + echo "Restarting DWM" notify-send -a " Desktop Manager" "Dwm Restarted" fi diff --git a/.config/config.env.default b/.config/config.env.default index d7c4f340..d6b2b259 100644 --- a/.config/config.env.default +++ b/.config/config.env.default @@ -15,3 +15,4 @@ export LOCATION=ankara export ACTIVITYWATCH=false export FIREFOX_PROFILE=a1lv19vn.default-release export LATLONG="39.92:32.85" +export VPS=0 diff --git a/.local/src/dwm/config.mk b/.local/src/dwm/config.mk index 3fb3104a..54e61dd1 100644 --- a/.local/src/dwm/config.mk +++ b/.local/src/dwm/config.mk @@ -28,7 +28,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-r # 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 = -w -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} +CFLAGS = -w -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} -D"VPS=${VPS}" LDFLAGS = ${LIBS} # Solaris diff --git a/.local/src/dwm/keybinds.h b/.local/src/dwm/keybinds.h index f2f527c2..a29ea4ff 100644 --- a/.local/src/dwm/keybinds.h +++ b/.local/src/dwm/keybinds.h @@ -89,7 +89,14 @@ static Key keys[] = { { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY|ShiftMask, XK_z, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, + +#if VPS == 1 + { MODKEY|ShiftMask, XK_q, killclient, {0} }, +#else { MODKEY, XK_q, killclient, {0} }, + { MODKEY|ShiftMask, XK_q, spawn, {.v = outmenu} }, +#endif + { MODKEY|Mod1Mask, XK_i, incnmaster, {.i = +1 } }, { MODKEY|Mod1Mask, XK_s, incnmaster, {.i = -1 } }, { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, @@ -120,7 +127,6 @@ static Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, spawn, {.v = outmenu} }, { MODKEY|ShiftMask, XK_t, spawn, {.v = trackpad} }, { MODKEY, XK_x, spawn, {.v = lock } }, { MODKEY|ShiftMask, XK_x, spawn, {.v = killall } }, @@ -140,7 +146,7 @@ static Key keys[] = { { 0, XF86XK_AudioPlay, spawn, {.v = play } }, { 0, XF86XK_AudioNext, spawn, {.v = next } }, { 0, XK_Print, spawn, {.v = screenshot } }, - { MODKEY|ShiftMask|Mod1Mask, XK_s, togglesticky, { 0 } }, + { MODKEY|ShiftMask|Mod1Mask, XK_s, togglesticky, { 0 } }, { MODKEY, XK_Print, spawn, {.v = windowshot } }, { MODKEY|Mod1Mask, XK_Print, spawn, {.v = selectshot } }, { MODKEY|ShiftMask, XK_e, spawn, {.v = emoji } },