From c0d1ed7d19021f451b2dd3f7d7bcb5c0818b26be Mon Sep 17 00:00:00 2001 From: Joshua Yun Date: Mon, 31 Mar 2025 23:20:07 -0500 Subject: feat: disable xwayland, added xwayland-satellite and dunst, cleaned up dbus, added volume control --- config.def.h | 12 ++++++++---- config.mk | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config.def.h b/config.def.h index a202ea4..143bee1 100644 --- a/config.def.h +++ b/config.def.h @@ -30,8 +30,10 @@ static int log_level = WLR_ERROR; /* Autostart */ static const char *const autostart[] = { - "dbus-update-activation-environment", "WAYLAND_DISPLAY", "XDG_CURRENT_DESKTOP", "XDG_SESSION_DESKTOP", "XDG_SESSION_TYPE", NULL, - "systemctl", "--user" , "import-environment", "WAYLAND_DISPLAY", "XDG_CURRENT_DESKTOP", "XDG_SESSION_DESKTOP", "XDG_SESSION_TYPE", NULL, + "systemctl", "--user" , "import-environment", "WAYLAND_DISPLAY", "XDG_CURRENT_DESKTOP", "XDG_SESSION_DESKTOP", "XDG_SESSION_TYPE", NULL, + "dbus-update-activation-environment", "--systemd", "--all", NULL, + "xwayland-satellite", NULL, + "dunst", NULL, "nm-applet", NULL, "blueman-applet", NULL, "wbg", "/home/joshua/.local/share/wallpaper", NULL, @@ -63,8 +65,8 @@ static const Layout layouts[] = { /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */ static const MonitorRule monrules[] = { /* name mfact nmaster scale layout rotate/reflect x y */ - { "eDP-1", 0.5f, 1, 1.5, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, - { "HDMI-A-1", 0.5f, 1, 1.5, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, + /* { "eDP-1", 0.5f, 1, 1.5, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, */ + /* { "HDMI-A-1", 0.5f, 1, 1.5, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, */ /* defaults */ { NULL, 0.5f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, }; @@ -148,6 +150,8 @@ static const Key keys[] = { { MODKEY, XKB_KEY_d, spawn, {.v = menucmd} }, { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} }, { MODKEY, XKB_KEY_w, spawn, {.v = browsercmd} }, + { MODKEY, XKB_KEY_plus, spawn, SHCMD("pamixer --allow-boost -i 3") }, + { MODKEY, XKB_KEY_minus, spawn, SHCMD("pamixer --allow-boost -d 3") }, { MODKEY, XKB_KEY_b, togglebar, {0} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, diff --git a/config.mk b/config.mk index 152f419..9b1a518 100644 --- a/config.mk +++ b/config.mk @@ -27,8 +27,8 @@ WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19` XWAYLAND = XLIBS = # Uncomment to build XWayland support -XWAYLAND = -DXWAYLAND -XLIBS = xcb xcb-icccm +# XWAYLAND = -DXWAYLAND +# XLIBS = xcb xcb-icccm # dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11). # To avoid warnings about them, we do not use -std=c99 and instead of using the -- cgit v1.2.3