From ed47e657c214291f4d59cbbcc4d2095ac9c07ecc Mon Sep 17 00:00:00 2001 From: lhark Date: Mon, 16 Nov 2020 02:25:29 +0100 Subject: [PATCH] Update and cleanup config for pixie --- config.def.h | 105 ++++++++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/config.def.h b/config.def.h index 34fe97f..3efc3ce 100644 --- a/config.def.h +++ b/config.def.h @@ -1,4 +1,5 @@ /* See LICENSE file for copyright and license details. */ +#include /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ @@ -9,8 +10,8 @@ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display static const int showsystray = 1; /* 0 means no systray */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=10" }; -static const char dmenufont[] = "monospace:size=10"; +static const char *fonts[] = { "Hack:size=10" }; +static const char dmenufont[] = "Hack:size=10"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -62,53 +63,64 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; -static const char *termcmd[] = { "st", NULL }; -static const char *backlightinccmd[] = { "xbacklight", "-inc", "5", NULL }; -static const char *backlightdeccmd[] = { "xbacklight", "-dec", "5", NULL }; -static const char *volup[] = { "/usr/local/bin/volcont", "--up", NULL }; -static const char *voldown[] = { "/usr/local/bin/volcont", "--down", "5", NULL }; -static const char *voltog[] = { "/usr/local/bin/volcont", "--toggle", "5", NULL }; +static const char *termcmd[] = { "/usr/bin/kitty", "--single-instance", NULL }; +static const char *backlightinccmd[] = { "light", "-A", "5", NULL }; +static const char *backlightdeccmd[] = { "light", "-U", "5", NULL }; +static const char *volup[] = { "volcont", "--up", NULL }; +static const char *voldown[] = { "volcont", "--down", NULL }; +static const char *voltog[] = { "volcont", "--toggle", NULL }; static const char *slock[] = { "slock", NULL }; -static const char *keepass[] = { "mono", "/usr/share/keepass/KeePass.exe", "--auto-type", NULL }; -static const char *pass[] = { "/usr/local/bin/passautotype", "-t", NULL }; -static const char *touchtog[] = { "/usr/local/bin/touchtog", NULL }; /* touchpad toggle */ -static const char *clipqr[] = { "/usr/local/bin/clipqr", NULL }; /* clipboard to QR */ +static const char *touchtog[] = { "touchtog", NULL }; /* touchpad toggle */ +static const char *clipqr[] = { "cliplumber", NULL }; /* clipboard to QR */ +static const char *mpdtoggle[] = { "/usr/bin/mpc", "toggle", NULL }; +static const char *mpdnext[] = { "/usr/bin/mpc", "next", NULL }; +static const char *mpdprev[] = { "/usr/bin/mpc", "prev", NULL }; +static const char *splatmoji[] = { "/usr/bin/splatmoji", "type", NULL }; static Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_r, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { 0, 0x1008ff02,spawn, {.v = backlightinccmd } }, - { 0, 0x1008ff03,spawn, {.v = backlightdeccmd } }, - { 0, 0x1008ff13,spawn, {.v = volup } }, - { 0, 0x1008ff11,spawn, {.v = voldown } }, - { 0, 0x1008ff12,spawn, {.v = voltog } }, - { 0, 0x1008ffa9,spawn, {.v = touchtog } }, - { MODKEY, XK_l, spawn, {.v = slock } }, - { MODKEY, XK_a, spawn, {.v = keepass } }, - { MODKEY, XK_z, spawn, {.v = pass } }, - { MODKEY, XK_v, spawn, {.v = clipqr } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_Tab, focusstack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_Tab, focusstack, {.i = -1 } }, - { MODKEY|ShiftMask, XK_Up, incnmaster, {.i = +1 } }, - { MODKEY|ShiftMask, XK_Down, incnmaster, {.i = -1 } }, - { MODKEY, XK_Up, setmfact, {.f = -0.05} }, - { MODKEY, XK_Down, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - { MODKEY, XK_j, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY, XK_agrave, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_agrave, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_semicolon, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_semicolon, tagmon, {.i = +1 } }, + /* modifier key function argument */ + { 0, XF86XK_MonBrightnessUp, spawn, {.v = backlightinccmd } }, + { 0, XF86XK_MonBrightnessDown, spawn, {.v = backlightdeccmd } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volup } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldown } }, + { 0, XF86XK_AudioMute, spawn, {.v = voltog } }, + { 0, XF86XK_TouchpadToggle, spawn, {.v = touchtog } }, + { 0, XF86XK_AudioPlay, spawn, {.v = mpdtoggle } }, + { 0, XF86XK_AudioPrev, spawn, {.v = mpdprev } }, + { 0, XF86XK_AudioNext, spawn, {.v = mpdnext } }, + //{ Mod4Mask, XK_Right, spawn, {.v = volup } }, + //{ Mod4Mask, XK_Left, spawn, {.v = voldown } }, + //{ Mod4Mask, XK_KP_0, spawn, {.v = voltog } }, + { MODKEY, XK_r, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_p, spawn, {.v = mpdtoggle } }, + { MODKEY, XK_less, spawn, {.v = mpdprev } }, + { MODKEY|ShiftMask, XK_less, spawn, {.v = mpdnext } }, + { MODKEY, XK_l, spawn, {.v = slock } }, + { MODKEY, XK_v, spawn, {.v = clipqr } }, + { MODKEY, XK_e, spawn, {.v = splatmoji } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_Tab, focusstack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_Tab, focusstack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_Up, incnmaster, {.i = +1 } }, + { MODKEY|ShiftMask, XK_Down, incnmaster, {.i = -1 } }, + { MODKEY, XK_Up, setmfact, {.f = -0.05} }, + { MODKEY, XK_Down, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, + { MODKEY, XK_j, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_agrave, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_agrave, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_semicolon, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_semicolon, tagmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_q, quit, {0} }, TAGKEYS( XK_ampersand, 0) TAGKEYS( XK_eacute, 1) TAGKEYS( XK_quotedbl, 2) @@ -118,7 +130,6 @@ static Key keys[] = { TAGKEYS( XK_egrave, 6) TAGKEYS( XK_underscore, 7) TAGKEYS( XK_ccedilla, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, }; /* button definitions */