From 924eafe75b129cded9169e72fe14c6432d5b37af Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 15 Oct 2023 19:02:57 -0400 Subject: [PATCH] update confg - Disable bartab border - Remove font from xresourcs config and manually set font - Update keybindings --- config.h | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/config.h b/config.h index 9e26ce3..8214d99 100644 --- a/config.h +++ b/config.h @@ -6,7 +6,7 @@ * Appearance */ static unsigned int snap = 32; /* snap pixel */ -static char *fonts[] = { "monospace:size=14" }; +static char *fonts[] = { "Iosevka Term:size=14" }; static unsigned int borderpx = 1; /* border pixel of windows */ static char normbgcolor[] = "#222222"; static char normbordercolor[] = "#444444"; @@ -41,7 +41,7 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Emacs", NULL, NULL, 1 << 1, 0, -1 }, + { "Emacs", NULL, NULL, 1 << 0, 0, -1 }, { "Firefox", NULL, NULL, 1 << 1, 0, -1 }, { "st", NULL, NULL, 1 << 2, 0, -1 }, { "Slack", NULL, NULL, 1 << 3, 0, -1 }, @@ -65,7 +65,7 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen win * Bartabgroups properties */ #define BARTAB_BORDERS 1 // 0 = off, 1 = on -#define BARTAB_BOTTOMBORDER 1 // 0 = off, 1 = on +#define BARTAB_BOTTOMBORDER 0 // 0 = off, 1 = on #define BARTAB_TAGSINDICATOR 1 // 0 = off, 1 = on if >1 client/view tag, 2 = always on #define BARTAB_TAGSPX 5 // # pixels for tag grid boxes #define BARTAB_TAGSROWS 3 // # rows in tag grid (9 tags, e.g. 3x3) @@ -83,7 +83,6 @@ static const Layout layouts[] = { * Xresources preferences to load at startup */ ResourcePref resources[] = { - { "font", STRING, &fonts[0] }, { "normbgcolor", STRING, &normbgcolor }, { "normbordercolor", STRING, &normbordercolor }, { "normfgcolor", STRING, &normfgcolor }, @@ -96,7 +95,7 @@ ResourcePref resources[] = { /* * Key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -118,16 +117,17 @@ static Key keys[] = { { MODKEY, XK_t, spawn, {.v = dmenucmd } }, { MODKEY, XK_a, spawn, {.v = termcmd } }, { MODKEY, XK_g, spawn, SHCMD("emacsclient -c") }, - { MODKEY, XK_q, spawn, SHCMD("dmenu-sys") }, + { MODKEY|ShiftMask, XK_g, spawn, SHCMD("emacs") }, { MODKEY, XK_s, spawn, SHCMD("pass-dmenu type") }, { MODKEY|ShiftMask, XK_S, spawn, SHCMD("pass-dmenu clip") }, /* window manager controls */ - { MODKEY|ControlMask, XK_j, togglebar, {0} }, + { MODKEY|ControlMask, XK_q, spawn, SHCMD("dmenu-sys") }, + { MODKEY|ControlMask, XK_z, togglebar, {0} }, { MODKEY|ControlMask, XK_u, incnmaster, {.i = +1 } }, - { MODKEY|ControlMask, XK_d, incnmaster, {.i = -1 } }, - { MODKEY|ControlMask, XK_h, setmfact, {.f = -0.05} }, - { MODKEY|ControlMask, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ControlMask, XK_e, incnmaster, {.i = -1 } }, + { MODKEY|ControlMask, XK_i, setmfact, {.f = -0.05} }, + { MODKEY|ControlMask, XK_n, setmfact, {.f = +0.05} }, { MODKEY, XK_w, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_p, setlayout, {.v = &layouts[2]} }, @@ -137,8 +137,8 @@ static Key keys[] = { /* window management */ { MODKEY, XK_n, focusstack, {.i = +1 } }, - { MODKEY, XK_e, focusstack, {.i = -1 } }, - { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, XK_i, focusstack, {.i = -1 } }, + { MODKEY, XK_m, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, @@ -146,18 +146,21 @@ static Key keys[] = { { MODKEY, XK_q, killclient, {0} }, /* monitor navigation */ - { MODKEY, XK_i, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_i, tagmon, {.i = +1 } }, + { MODKEY, XK_comma, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = +1 } }, /* system managemment */ { 0, XF86XK_AudioMute, spawn, SHCMD("pamixer --toggle-mute") }, - { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -i 5") }, - { ShiftMask, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -i 10") }, - { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -d 5") }, - { ShiftMask, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -d 10") }, + { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -d 5") }, + { ShiftMask, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -d 10") }, + { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -i 5") }, + { ShiftMask, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -i 10") }, + { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("sudo light -A 5") }, + { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("sudo light -U 5") }, { 0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") }, { 0, XF86XK_AudioNext, spawn, SHCMD("playerctl next") }, { 0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") }, + { 0, XF86XK_Display, spawn, SHCMD("autorandr --change") }, /* tags */ TAGKEYS( XK_1, 0)