new shortcuts, moved some stuff around
This commit is contained in:
parent
daa1283e7c
commit
5430b7d415
3 changed files with 172 additions and 158 deletions
165
config.h
165
config.h
|
|
@ -2,7 +2,7 @@
|
|||
#include <X11/X.h>
|
||||
#include <X11/Xutil.h>
|
||||
static const unsigned int borderpx = 2;
|
||||
static const unsigned int snap = 0;
|
||||
static const unsigned int snap = 0;
|
||||
static const unsigned int swallowfloating = 0;
|
||||
static const unsigned int gappih = 20;
|
||||
static const unsigned int gappiv = 10;
|
||||
|
|
@ -11,7 +11,7 @@ static const unsigned int gappov = 10;
|
|||
static int smartgaps = 1;
|
||||
static const int showbar = 1;
|
||||
static const int topbar = 1;
|
||||
static const char *fonts[] = { "Mononoki Nerd Font Propo:size=12", "Noto Color Emoji:size=11" };
|
||||
static const char *fonts[] = { "Mononoki Nerd Font Propo:size=12", "Apple Color Emoji:size=11" };
|
||||
static const char col_gray1[] = "#232323";
|
||||
static const char col_gray2[] = "#3a3a3a";
|
||||
static const char col_gray3[] = "#a0a0a0";
|
||||
|
|
@ -33,7 +33,7 @@ static const unsigned int alphas[][3] = {
|
|||
};
|
||||
|
||||
/* tagging */
|
||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "", "" };
|
||||
static const char *tags[] = { "", "", "3", "4", "5", "6", "7", "", "" };
|
||||
static const char *metaworkspaces[] = { "", "", "", "", "" };
|
||||
|
||||
static const Rule rules[] = {
|
||||
|
|
@ -41,13 +41,16 @@ static const Rule rules[] = {
|
|||
* WM_CLASS(STRING) = instance, class
|
||||
* WM_NAME(STRING) = title
|
||||
*/
|
||||
/* class instance title tags_mask isfloating isterminal noswallow monitor mwpin*/
|
||||
{ "firefox-nightly", "Toolkit", "Picture-in-Picture", 511, 1, 0, 1, -1, 1 },
|
||||
{ "copyq", NULL, NULL, 0, 1, 0, 0, -1, 0 },
|
||||
{ "Alacritty", NULL, NULL, 0, 0, 1, 0, -1, 0 },
|
||||
{ "floating", NULL, NULL, 0, 1, 0, 0, -1, 0 },
|
||||
{ "Spotify", "spotify", NULL, 128, 0, 0, 0, 0, 1 },
|
||||
{ "TelegramDesktop", "telegram-desktop", NULL, 256, 0, 0, 0, 0, 1 },
|
||||
/* class instance title tags_mask isfloating isterminal noswallow monitor mwpin*/
|
||||
/* WM_CLASS[2] WM_CLASS[1] WM_NAME tags_mask isfloating isterminal noswallow monitor mwpin*/
|
||||
{ "firefox-nightly", "Toolkit", "Picture-in-Picture", 511, 1, 0, 1, -1, 1 },
|
||||
{ "TelegramDesktop", "telegram-desktop", "TelegramDesktop", 511, 1, 0, 1, -1, 1 },
|
||||
{ "", NULL, "Picture in picture", 511, 1, 0, 1, -1, 1 },
|
||||
{ "copyq", NULL, NULL, 0, 1, 0, 0, -1, 0 },
|
||||
{ "Alacritty", NULL, NULL, 0, 0, 1, 0, -1, 0 },
|
||||
{ "floating", NULL, NULL, 0, 1, 0, 0, -1, 0 },
|
||||
{ "feishin", "feishin", NULL, 128, 0, 0, 0, 0, 1 },
|
||||
{ "TelegramDesktop", "telegram-desktop", NULL, 256, 0, 0, 0, 0, 1 },
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -64,9 +67,7 @@ static const int spawnmaster = 0;
|
|||
static const Layout layouts[] = {
|
||||
/* symbol reverse function */
|
||||
{ "", "", tile },
|
||||
{ "[/]", "[\\]", dwindle},
|
||||
{ "[M]", "[M]", monocle },
|
||||
{ "><>", "<><", NULL },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
|
|
@ -74,14 +75,14 @@ static const Layout layouts[] = {
|
|||
#define AltMask Mod1Mask
|
||||
|
||||
#define TAGKEYS(KEY,TAG) \
|
||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ShiftMask, KEY, tagview, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ShiftMask, KEY, tagview, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|AltMask, KEY, toggletag, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
{ AltMask, KEY, viewmetaws, {.ui = TAG} }, \
|
||||
{ AltMask|ShiftMask, KEY, tagviewmetaws, {.ui = TAG} }, \
|
||||
{ AltMask|ControlMask, KEY, tagmetaws, {.ui = TAG} }, \
|
||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
{ AltMask, KEY, viewmetaws, {.ui = TAG} }, \
|
||||
{ AltMask|ShiftMask, KEY, tagviewmetaws, {.ui = TAG} }, \
|
||||
{ AltMask|ControlMask, KEY, tagmetaws, {.ui = TAG} }, \
|
||||
|
||||
#define SHCMD(...) { .v = (const char*[]){ __VA_ARGS__, NULL } }
|
||||
|
||||
|
|
@ -91,93 +92,93 @@ static const char *termcmd[] = { "alacritty", NULL };
|
|||
|
||||
#include "movestack.c"
|
||||
static const Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
/* modifier key function argument */
|
||||
// movement
|
||||
{ MODKEY, XK_d, spawn, {.v = dmenucmd } },
|
||||
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY|ShiftMask, XK_b, togglebar, {0} },
|
||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||
{ MODKEY, XK_n, setmfact, {.f = -0.05} },
|
||||
{ MODKEY, XK_m, setmfact, {.f = +0.05} },
|
||||
{ MODKEY|ShiftMask, XK_n, incnmaster, {.i = -1} },
|
||||
{ MODKEY|ShiftMask, XK_m, incnmaster, {.i = +1} },
|
||||
{ MODKEY, XK_c, zoom, {0} },
|
||||
{ MODKEY, XK_q, killclient, {0} },
|
||||
{ MODKEY, XK_d, spawn, {.v = dmenucmd } },
|
||||
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY|ShiftMask, XK_b, togglebar, {0} },
|
||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_n, setmfact, {.f = -0.05} },
|
||||
{ MODKEY|ShiftMask, XK_m, setmfact, {.f = +0.05} },
|
||||
{ MODKEY, XK_c, zoom, {0} },
|
||||
{ MODKEY, XK_q, killclient, {0} },
|
||||
|
||||
// layout
|
||||
{ MODKEY, XK_f, togglefullscr, {0} },
|
||||
{ MODKEY|ShiftMask, XK_f, togglefloating, {0} },
|
||||
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
{ MODKEY|ControlMask, XK_0, tag, {.ui = ~0 } },
|
||||
{ AltMask|ControlMask, XK_0, pinmetaws, {0} },
|
||||
{ MODKEY|ControlMask, XK_p, invertdir, {0} },
|
||||
{ MODKEY, XK_f, togglefullscr, {0} },
|
||||
{ MODKEY|ShiftMask, XK_f, togglefloating, {0} },
|
||||
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
{ MODKEY|ControlMask, XK_0, tag, {.ui = ~0 } },
|
||||
{ AltMask|ControlMask, XK_0, pinmetaws, {0} },
|
||||
{ MODKEY|ControlMask, XK_p, invertdir, {0} },
|
||||
|
||||
// apps
|
||||
{ MODKEY, XK_w, spawn, SHCMD("firefox") },
|
||||
{ MODKEY, XK_t, spawn, SHCMD("telegram-desktop") },
|
||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("flameshot", "gui") },
|
||||
{ MODKEY|ShiftMask, XK_r, spawn, SHCMD("xr") },
|
||||
{ MODKEY, XK_w, spawn, SHCMD("firefox") },
|
||||
{ MODKEY|ShiftMask, XK_w, spawn, SHCMD("chromium") },
|
||||
{ MODKEY, XK_t, spawn, SHCMD("telegram-desktop") },
|
||||
{ MODKEY, XK_x, spawn, SHCMD("win") },
|
||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("flameshot", "gui") },
|
||||
{ MODKEY|ShiftMask, XK_r, spawn, SHCMD("xr") },
|
||||
{ MODKEY|ShiftMask|ControlMask, XK_s, spawn, SHCMD("systemctl", "suspend")},
|
||||
|
||||
// dunst
|
||||
{ MODKEY, XK_i, spawn, SHCMD("dunstctl", "history-pop") },
|
||||
{ MODKEY, XK_o, spawn, SHCMD("dunstctl", "close") },
|
||||
{ MODKEY|ControlMask, XK_i, spawn, SHCMD("dunstctl", "set-paused", "false") },
|
||||
{ MODKEY|ControlMask, XK_o, spawn, SHCMD("dunstctl", "set-paused", "true") },
|
||||
{ MODKEY|ShiftMask, XK_i, spawn, SHCMD("dunstctl", "context") },
|
||||
{ MODKEY|ShiftMask, XK_o, spawn, SHCMD("dunstctl", "action") },
|
||||
{ MODKEY, XK_i, spawn, SHCMD("dunstctl", "history-pop") },
|
||||
{ MODKEY, XK_o, spawn, SHCMD("dunstctl", "close") },
|
||||
{ MODKEY|ShiftMask, XK_i, spawn, SHCMD("dunstctl", "set-paused", "false") },
|
||||
{ MODKEY|ShiftMask, XK_o, spawn, SHCMD("dunstctl", "set-paused", "true") },
|
||||
{ MODKEY|ControlMask, XK_i, spawn, SHCMD("dunstctl", "context") },
|
||||
{ MODKEY|ControlMask, XK_o, spawn, SHCMD("dunstctl", "action") },
|
||||
|
||||
// vpn
|
||||
{ MODKEY, XK_v, spawn, SHCMD("vpn", "msk") },
|
||||
{ MODKEY|ControlMask, XK_v, spawn, SHCMD("vpn", "-d") },
|
||||
{ MODKEY|ShiftMask, XK_v, spawn, SHCMD("vpn") },
|
||||
{ MODKEY|AltMask, XK_v, spawn, SHCMD("vpn", "-d", "msk") },
|
||||
{ MODKEY, XK_v, spawn, SHCMD("vpn") },
|
||||
{ MODKEY|ShiftMask, XK_v, spawn, SHCMD("vpn", "msk") },
|
||||
|
||||
// volume
|
||||
{ MODKEY|ShiftMask, XK_Up, spawn, SHCMD("volume", "+1") },
|
||||
{ MODKEY|ShiftMask, XK_Down, spawn, SHCMD("volume", "-1") },
|
||||
{ MODKEY, XK_Up, spawn, SHCMD("volume", "+5") },
|
||||
{ MODKEY, XK_Down, spawn, SHCMD("volume", "-5") },
|
||||
{ MODKEY, XK_y, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY|ShiftMask, XK_Up, spawn, SHCMD("volume", "+1") },
|
||||
{ MODKEY|ShiftMask, XK_Down, spawn, SHCMD("volume", "-1") },
|
||||
{ MODKEY, XK_Up, spawn, SHCMD("volume", "+5") },
|
||||
{ MODKEY, XK_Down, spawn, SHCMD("volume", "-5") },
|
||||
{ MODKEY, XK_y, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[1]} },
|
||||
|
||||
// tags
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
TAGKEYS( XK_4, 3)
|
||||
TAGKEYS( XK_5, 4)
|
||||
TAGKEYS( XK_6, 5)
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||
{ MODKEY, XK_h, focusmon, {.i = -1 } },
|
||||
{ MODKEY, XK_l, focusmon, {.i = +1 } },
|
||||
{ MODKEY|ControlMask, XK_h, tagmon, {.i = -1 } },
|
||||
{ MODKEY|ControlMask, XK_l, tagmon, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_h, focustagmon, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_l, focustagmon, {.i = +1 } },
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
TAGKEYS( XK_4, 3)
|
||||
TAGKEYS( XK_5, 4)
|
||||
TAGKEYS( XK_6, 5)
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||
{ MODKEY, XK_h, focusmon, {.i = -1 } },
|
||||
{ MODKEY, XK_l, focusmon, {.i = +1 } },
|
||||
{ MODKEY|ControlMask, XK_h, tagmon, {.i = -1 } },
|
||||
{ MODKEY|ControlMask, XK_l, tagmon, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_h, focustagmon, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_l, focustagmon, {.i = +1 } },
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, ClkRootWin, or ClkMetaWorkspace */
|
||||
static const Button buttons[] = {
|
||||
/* click event mask button function argument */
|
||||
/* click event mask button function argument */
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
{ ClkClientWin, MODKEY|ControlMask, Button1, resizemouse, {0} },
|
||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||
|
||||
{ ClkTagBar, 0, Button1, view, {0} },
|
||||
{ ClkTagBar, 0, Button1, view, {0} },
|
||||
{ ClkTagBar, ShiftMask, Button1, tagview, {0} },
|
||||
{ ClkTagBar, ControlMask, Button1, tag, {0} },
|
||||
{ ClkTagBar, AltMask, Button1, toggletag, {0} },
|
||||
{ ClkTagBar, AltMask, Button1, toggletag, {0} },
|
||||
{ ClkTagBar, ControlMask|ShiftMask, Button1, toggleview, {0} },
|
||||
|
||||
{ ClkMwSymbol, 0, Button1, cyclemetaws, {.i = +1} },
|
||||
{ ClkMwSymbol, 0, Button3, cyclemetaws, {.i = -1} },
|
||||
{ ClkMwSymbol, 0, Button1, cyclemetaws, {.i = +1} },
|
||||
{ ClkMwSymbol, 0, Button3, cyclemetaws, {.i = -1} },
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue