commit 79eb42c0395791517a63bb586f6369e06368adfc
parent a2daac838ff07811b1981579e6ef6ca3fa64c202
Author: Jake Koroman <jakekoroman@gmail.com>
Date: Tue, 4 Jun 2024 08:57:02 -0400
dwl updates and formatting fixes.
Diffstat:
2 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/device-specific/laptop/dwl-hardware.h b/device-specific/laptop/dwl-hardware.h
@@ -8,29 +8,29 @@
#ifndef NOT_DWL
/* monitors */
static const MonitorRule monrules[] = {
- /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
- /* name mfact nmaster scale layout rotate/reflect x y resx resy rate mode adaptive */
- { "NULL", 0.50f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 0.0f, 0, 0},
- { "eDP-1", 0.50f, 1, 1.5f, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 480, 2560, 1440, 60.0f, -1, 0},
- { "DP-4", 0.50f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 1706, 0, 2560, 1440, 60.0f, -1, 0},
+ /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
+ /* name mfact nmaster scale layout rotate/reflect x y resx resy rate mode adaptive */
+ { "NULL", 0.50f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 0.0f, 0, 0},
+ { "eDP-1", 0.50f, 1, 1.5f, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 480, 2560, 1440, 60.0f, -1, 0},
+ { "DP-4", 0.50f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 1706, 0, 2560, 1440, 60.0f, -1, 0},
};
/* Autostart */
static const char *const autostart[] = {
- "sh", "-c", "gentoo-pipewire-launcher", NULL,
- "swayidle.sh", NULL,
- "preserve_dbus.sh", NULL,
- "davmail_launch", NULL,
- "baraction.sh", NULL,
- "wbg", "/home/jake/Pictures/wallpaper", NULL,
- NULL /* terminate */
+ "sh", "-c", "gentoo-pipewire-launcher", NULL,
+ "swayidle.sh", NULL,
+ "preserve_dbus.sh", NULL,
+ "davmail_launch", NULL,
+ "baraction.sh", NULL,
+ "wbg", "/home/jake/Pictures/wallpaper", NULL,
+ NULL /* terminate */
};
/* keyboard */
static const struct xkb_rule_names xkb_rules = {
/* can specify fields: rules, model, layout, variant, options */
/* example:
- .options = "ctrl:nocaps",
+ .options = "ctrl:nocaps",
*/
.options = "caps:escape",
};
@@ -47,36 +47,36 @@ static const int disable_while_typing = 1;
static const int left_handed = 0;
static const int middle_button_emulation = 0;
/* You can choose between:
-LIBINPUT_CONFIG_SCROLL_NO_SCROLL
-LIBINPUT_CONFIG_SCROLL_2FG
-LIBINPUT_CONFIG_SCROLL_EDGE
-LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
+ LIBINPUT_CONFIG_SCROLL_NO_SCROLL
+ LIBINPUT_CONFIG_SCROLL_2FG
+ LIBINPUT_CONFIG_SCROLL_EDGE
+ LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
*/
static const enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
/* You can choose between:
-LIBINPUT_CONFIG_CLICK_METHOD_NONE
-LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS
-LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
+ LIBINPUT_CONFIG_CLICK_METHOD_NONE
+ LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS
+ LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
*/
static const enum libinput_config_click_method click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
/* You can choose between:
-LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
-LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
-LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE
+ LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
+ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
+ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE
*/
static const uint32_t send_events_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
/* You can choose between:
-LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT
-LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
+ LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT
+ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
*/
static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
static const double accel_speed = -0.6;
/* You can choose between:
-LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle
-LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
+ LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle
+ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
*/
static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
#endif
diff --git a/dwl/config.h b/dwl/config.h
@@ -1,16 +1,16 @@
/* Taken from https://github.com/djpohly/dwl/issues/466 */
-#define COLOR(hex) { ((hex >> 24) & 0xFF) / 255.0f, \
- ((hex >> 16) & 0xFF) / 255.0f, \
- ((hex >> 8) & 0xFF) / 255.0f, \
- (hex & 0xFF) / 255.0f }
+#define COLOR(hex) { ((hex >> 24) & 0xFF) / 255.0f, \
+ ((hex >> 16) & 0xFF) / 255.0f, \
+ ((hex >> 8) & 0xFF) / 255.0f, \
+ (hex & 0xFF) / 255.0f }
/* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
-static int gaps = 1; /* 1 means gaps between windows are added */
+static int gaps = 0; /* 1 means gaps between windows are added */
static const unsigned int gappx = 10; /* gap pixel between windows */
-static const unsigned int borderpx = 1; /* border pixel of windows */
+static const unsigned int borderpx = 2; /* border pixel of windows */
static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x181818ff);
/* static const float focuscolor[] = COLOR(0x3465a4ff); */
@@ -26,21 +26,13 @@ static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You ca
static int log_level = WLR_ERROR;
static const Rule rules[] = {
- /* app_id title tags mask isfloating isterm noswallow monitor */
- { "foot", NULL, 0, 0, 1, 1, -1 },
- { "librewolf", NULL, 0, 0, 0, 1, -1 },
- { "firefox", NULL, 0, 0, 0, 1, -1 },
+ /* app_id title tags mask isfloating isterm noswallow monitor */
+ { "foot", NULL, 0, 0, 1, 1, -1 },
+ { "librewolf", NULL, 0, 0, 0, 1, -1 },
+ { "firefox", NULL, 0, 0, 0, 1, -1 },
};
/* layout(s) */
-static const Layout layouts[] = {
- /* symbol arrange function */
- { "[]=", tile },
- { "><>", NULL }, /* no layout function means floating behavior */
- { "[M]", monocle },
- { "|M|", centeredmaster },
-};
-
enum LayoutFunction {
ltile = 0,
lfloat = 1,
@@ -48,14 +40,22 @@ enum LayoutFunction {
lcenteredmaster = 3,
};
+static const Layout layouts[] = {
+ /* symbol arrange function */
+ [ltile] = { "[]=", tile },
+ [lfloat] = { "><>", NULL }, /* no layout function means floating behavior */
+ [lmonocle] = { "[M]", monocle },
+ [lcenteredmaster] = { "|M|", centeredmaster },
+};
+
/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
#define MODKEY WLR_MODIFIER_LOGO
-#define TAGKEYS(KEY,SKEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
+#define TAGKEYS(KEY,SKEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
+ { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
+ { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,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 } }
@@ -90,81 +90,81 @@ static const char *voldowncmd[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SI
static const char *volupcmd[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "2%+", NULL };
static const Key keys[] = {
- /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
- /* modifier key function argument */
- { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
- { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} },
- { MODKEY, XKB_KEY_F1, spawn, {.v = pavucmd} },
- { MODKEY, XKB_KEY_slash, spawn, {.v = bookmarkscmd} },
- { MODKEY, XKB_KEY_backslash, spawn, {.v = sshmenucmd} },
- { MODKEY, XKB_KEY_F12, spawn, {.v = passcmd} },
- { MODKEY, XKB_KEY_n, spawn, SHCMD(TERMINAL " -e newsboat") },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_N, spawn, SHCMD(TERMINAL " -e neomutt") },
- { MODKEY, XKB_KEY_s, spawn, SHCMD("grimshot copy area") },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S, spawn, SHCMD("grimshot save area - | swappy -f -") },
- { MODKEY, XKB_KEY_b, spawn, {.v = browsercmd} },
- { MODKEY, XKB_KEY_r, spawn, {.v = rdpmenucmd} },
- { MODKEY, XKB_KEY_Delete, spawn, {.v = swaylockcmd} },
- { MODKEY, XKB_KEY_e, spawn, {.v = emacscmd} },
- { MODKEY, XKB_KEY_F2, togglebar, {0} },
- { MODKEY, XKB_KEY_g, togglegaps, {0} },
- { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
- { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J, movestack, {.i = +1} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K, movestack, {.i = -1} },
- { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
- { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
- { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
- { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, zoom, {0} },
- { MODKEY, XKB_KEY_Tab, view, {0} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
- { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[ltile]} },
- { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[lfloat]} },
- { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[lmonocle]} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M, setlayout, {.v = &layouts[lcenteredmaster]} },
- { MODKEY, XKB_KEY_space, setlayout, {0} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, togglefullscreen, {0} },
- { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
- { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
- { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
-
- { 0, AUDIODOWN, spawn, {.v = voldowncmd} },
- { 0, AUDIOUP, spawn, {.v = volupcmd} },
- { 0, AUDIOMUTE, spawn, {.v = volmutecmd} },
- { 0, PLAYPAUSE, spawn, {.v = playerctlcmd} },
-
- { 0, BRIGHTUP, spawn, {.v = brightupcmd} },
- { 0, BRIGHTDOWN, spawn, {.v = brightdowncmd} },
-
-
- TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
- TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
- TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
- TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
- TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
- TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5),
- TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
- TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
- TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
-
- /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
- { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
- /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
- * do not remove them.
- */
+ /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
+ /* modifier key function argument */
+ { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
+ { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} },
+ { MODKEY, XKB_KEY_F1, spawn, {.v = pavucmd} },
+ { MODKEY, XKB_KEY_slash, spawn, {.v = bookmarkscmd} },
+ { MODKEY, XKB_KEY_backslash, spawn, {.v = sshmenucmd} },
+ { MODKEY, XKB_KEY_F12, spawn, {.v = passcmd} },
+ { MODKEY, XKB_KEY_n, spawn, SHCMD(TERMINAL " -e newsboat") },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_N, spawn, SHCMD(TERMINAL " -e neomutt") },
+ { MODKEY, XKB_KEY_s, spawn, SHCMD("grimshot copy area") },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S, spawn, SHCMD("grimshot save area - | swappy -f -") },
+ { MODKEY, XKB_KEY_b, spawn, {.v = browsercmd} },
+ { MODKEY, XKB_KEY_r, spawn, {.v = rdpmenucmd} },
+ { MODKEY, XKB_KEY_Delete, spawn, {.v = swaylockcmd} },
+ { MODKEY, XKB_KEY_e, spawn, {.v = emacscmd} },
+ { MODKEY, XKB_KEY_F2, togglebar, {0} },
+ { MODKEY, XKB_KEY_g, togglegaps, {0} },
+ { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
+ { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J, movestack, {.i = +1} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K, movestack, {.i = -1} },
+ { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
+ { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
+ { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
+ { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, zoom, {0} },
+ { MODKEY, XKB_KEY_Tab, view, {0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
+ { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[ltile]} },
+ { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[lfloat]} },
+ { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[lmonocle]} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M, setlayout, {.v = &layouts[lcenteredmaster]} },
+ { MODKEY, XKB_KEY_space, setlayout, {0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, togglefullscreen, {0} },
+ { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
+ { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
+ { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
+
+ { 0, AUDIODOWN, spawn, {.v = voldowncmd} },
+ { 0, AUDIOUP, spawn, {.v = volupcmd} },
+ { 0, AUDIOMUTE, spawn, {.v = volmutecmd} },
+ { 0, PLAYPAUSE, spawn, {.v = playerctlcmd} },
+
+ { 0, BRIGHTUP, spawn, {.v = brightupcmd} },
+ { 0, BRIGHTDOWN, spawn, {.v = brightdowncmd} },
+
+
+ TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
+ TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
+ TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
+ TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
+ TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
+ TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5),
+ TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
+ TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
+ TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
+
+ /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
+ { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
+ /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
+ * do not remove them.
+ */
#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
- CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
- CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
+ CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
+ CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
};
static const Button buttons[] = {
- { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} },
- { MODKEY, BTN_MIDDLE, togglefloating, {0} },
- { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} },
+ { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} },
+ { MODKEY, BTN_MIDDLE, togglefloating, {0} },
+ { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} },
};
