From e0061756fb64b109cfdab087d7160a41cbe2f831 Mon Sep 17 00:00:00 2001 From: q3aql Date: Sun, 4 Dec 2022 02:14:47 +0100 Subject: [PATCH] Dotfiles config update (2022-12-04) --- .config/dwl/build-install.sh | 1 + .config/dwl/config.def.h | 76 +++++++++++++++++++++--------------- .config/dwl/config.h | 4 +- .config/dwl/scripts/foot-run | 15 +++++++ 4 files changed, 63 insertions(+), 33 deletions(-) create mode 100755 .config/dwl/scripts/foot-run diff --git a/.config/dwl/build-install.sh b/.config/dwl/build-install.sh index 4bc31b5..814a0bf 100755 --- a/.config/dwl/build-install.sh +++ b/.config/dwl/build-install.sh @@ -15,6 +15,7 @@ fi echo "" ; echo "# INSTALLING DWL" echo "" make install clean +cp -rfv scripts/foot-run /usr/bin/foot-run echo "" ; echo "# INSTALLING SOMEBAR (FOR DWL)" cd somebar ./install.sh diff --git a/.config/dwl/config.def.h b/.config/dwl/config.def.h index 4f36905..a333b32 100644 --- a/.config/dwl/config.def.h +++ b/.config/dwl/config.def.h @@ -2,10 +2,10 @@ static const int sloppyfocus = 1; /* focus follows mouse */ static const unsigned int borderpx = 1; /* border pixel of windows */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ -static const unsigned int gappih = 10; /* horiz inner gap between windows */ -static const unsigned int gappiv = 10; /* vert inner gap between windows */ -static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */ +static const unsigned int gappih = 6; /* horiz inner gap between windows */ +static const unsigned int gappiv = 6; /* vert inner gap between windows */ +static const unsigned int gappoh = 6; /* horiz outer gap between windows and screen edge */ +static const unsigned int gappov = 6; /* vert outer gap between windows and screen edge */ static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */ static const int monoclegaps = 0; /* 1 means outer gaps in monocle layout */ static const float rootcolor[] = {0.3, 0.3, 0.3, 1.0}; @@ -118,44 +118,49 @@ 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|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, + { MODKEY, XKB_KEY_Return, spawn, SHCMD("foot-run") }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, SHCMD("wofi --show drun") }, + { MODKEY, XKB_KEY_o, spawn, SHCMD("/usr/bin/bemenu_drun") }, + { MODKEY, XKB_KEY_p, spawn, SHCMD("/usr/bin/bemenu_run") }, + { MODKEY, XKB_KEY_n, spawn, SHCMD("pcmanfm") }, + { MODKEY, XKB_KEY_b, spawn, SHCMD("firefox") }, + { MODKEY, XKB_KEY_e, spawn, SHCMD("geany") }, + { MODKEY, XKB_KEY_m, spawn, SHCMD("telegram") }, + { MODKEY, XKB_KEY_u, spawn, SHCMD("kitty") }, + { MODKEY, XKB_KEY_a, spawn, SHCMD("lxappearance") }, + { MODKEY, XKB_KEY_x, spawn, SHCMD("wdisplays") }, + { MODKEY, XKB_KEY_s, spawn, SHCMD("~/.config/dwl/scripts/wayland-screenshot") }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S, spawn, SHCMD("kitty -e wf-recorder") }, + { MODKEY, XKB_KEY_c, spawn, SHCMD("/usr/bin/bemenu_cmd") }, + { MODKEY, XKB_KEY_t, spawn, SHCMD("/usr/bin/bemenu_themes") }, + { MODKEY, XKB_KEY_f, spawn, SHCMD("/usr/bin/bemenu_fbrun") }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E, spawn, SHCMD("/usr/bin/bemenu_close") }, + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_q, spawn, SHCMD("/usr/bin/bemenu_close") }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, - { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_I, incnmaster, {.i = -1} }, { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} }, { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} }, - { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_h, incgaps, {.i = +1 } }, - { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_l, incgaps, {.i = -1 } }, - { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_H, incogaps, {.i = +1 } }, - { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_L, incogaps, {.i = -1 } }, - { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_h, incigaps, {.i = +1 } }, - { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_l, incigaps, {.i = -1 } }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_G, incgaps, {.i = +1 } }, + { MODKEY, XKB_KEY_g, incgaps, {.i = -1 } }, { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_0, togglegaps, {0} }, { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,defaultgaps, {0} }, - { MODKEY, XKB_KEY_y, incihgaps, {.i = +1 } }, - { MODKEY, XKB_KEY_o, incihgaps, {.i = -1 } }, - { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_y, incivgaps, {.i = +1 } }, - { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_o, incivgaps, {.i = -1 } }, - { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_y, incohgaps, {.i = +1 } }, - { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_o, incohgaps, {.i = -1 } }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Y, incovgaps, {.i = +1 } }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O, incovgaps, {.i = -1 } }, - { MODKEY, XKB_KEY_Return, zoom, {0} }, - { MODKEY, XKB_KEY_Tab, view, {0} }, + /*{ MODKEY, XKB_KEY_Return, zoom, {0} },*/ + { MODKEY, XKB_KEY_Tab, setlayout, {.v = &layouts[2]} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, killclient, {0} }, - { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XKB_KEY_space, setlayout, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, - { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Tab, setlayout, {.v = &layouts[0]} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_T, setlayout, {.v = &layouts[1]} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M, setlayout, {.v = &layouts[2]} }, + /*{ MODKEY, XKB_KEY_space, setlayout, {0} },*/ + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, togglefloating, {0} }, + { MODKEY, XKB_KEY_space, 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} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon, tagmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_period, tagmon, {.i = WLR_DIRECTION_RIGHT} }, TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), @@ -165,7 +170,16 @@ static const Key keys[] = { 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_E, quit, {0} }, + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_r, quit, {0} }, + + // Volume + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_h, spawn, SHCMD("pactl set-sink-volume @DEFAULT_SINK@ +5%") }, + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_g, spawn, SHCMD("pactl set-sink-volume @DEFAULT_SINK@ -5%") }, + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_f, spawn, SHCMD("pactl set-sink-mute @DEFAULT_SINK@ toggle") }, + + // Brightness + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_p, spawn, SHCMD("brightnessctl set 10%-") }, + { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_o, spawn, SHCMD("brightnessctl set 10%+") }, /* 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} }, diff --git a/.config/dwl/config.h b/.config/dwl/config.h index bcc36a0..a333b32 100644 --- a/.config/dwl/config.h +++ b/.config/dwl/config.h @@ -118,7 +118,7 @@ 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, SHCMD("footclient") }, + { MODKEY, XKB_KEY_Return, spawn, SHCMD("foot-run") }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, SHCMD("wofi --show drun") }, { MODKEY, XKB_KEY_o, spawn, SHCMD("/usr/bin/bemenu_drun") }, { MODKEY, XKB_KEY_p, spawn, SHCMD("/usr/bin/bemenu_run") }, @@ -159,7 +159,7 @@ static const Key keys[] = { { 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_comma, tagmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon, tagmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_period, tagmon, {.i = WLR_DIRECTION_RIGHT} }, TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), diff --git a/.config/dwl/scripts/foot-run b/.config/dwl/scripts/foot-run new file mode 100755 index 0000000..451fdc8 --- /dev/null +++ b/.config/dwl/scripts/foot-run @@ -0,0 +1,15 @@ +#!/bin/bash + +load_file="${HOME}/.foot-run.desktop" +echo '[Desktop Entry]' > ${load_file} +echo 'Type=Application' >> ${load_file} +echo 'Exec=foot' >> ${load_file} +echo 'Icon=foot' >> ${load_file} +echo 'Terminal=false' >> ${load_file} +echo 'Categories=System;TerminalEmulator;' >> ${load_file} +echo 'Keywords=shell;prompt;command;commandline;' >> ${load_file} +echo '' >> ${load_file} +echo 'Name=Foot' >> ${load_file} +echo 'GenericName=Terminal' >> ${load_file} +echo 'Comment=A wayland native terminal emulator' >> ${load_file} +dex ${load_file}