From cf8aefdf23c53cb3f83428269aa74b6eb47657fd Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Thu, 8 Jul 2021 15:51:18 +0200 Subject: Latest update --- config.h | 282 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 165 insertions(+), 117 deletions(-) (limited to 'config.h') diff --git a/config.h b/config.h index d72da80..4363c5b 100644 --- a/config.h +++ b/config.h @@ -5,55 +5,44 @@ #define TERMCLASS "Alacritty" /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const unsigned int systraypinning = 2; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ -static const unsigned int systrayspacing = 8; /* systray spacing */ -static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ -static const int showsystray = 1; /* 0 means no systray */ -static const unsigned int gappih = 23; /* horiz inner gap between windows */ -static const unsigned int gappiv = 23; /* vert inner gap between windows */ -static const unsigned int gappoh = 23; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 23; /* vert outer gap between windows and screen edge */ -static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ -static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "Space Mono Nerd Font Regular:size=11", "JoyPixels:pixelsize=11:antialias=true:autohint=true" }; -static const char *upvol[] = { "/usr/bin/pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL }; -static const char *downvol[] = { "/usr/bin/pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL }; -static const char *mutevol[] = { "/usr/bin/pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL }; -static const char col_gray1[] = "#232731"; -static const char col_gray2[] = "#333333"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; -static const char col_purple[] = "#5a5aa4"; -static const char col_red[] = "#d54646"; -static const char col_green[] = "#23d18b"; -static const char col_yellow[] = "#d7ba7d"; -static const char col_blue[] = "#81a1c1"; -static const char col_magenta[] = "#c586c0"; -static const char col_white[] = "#abb2bf"; -static const char col_bg_alt[] = "#292d38"; - -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray4, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_blue, col_blue }, - [SchemeStatus] = { col_gray4, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty} - - [SchemeTagsSel] = { col_gray2, col_blue, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty} - [SchemeTagsNorm] = { col_gray4, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty} - - [SchemeInfoSel] = { col_gray3, col_bg_alt, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty} - [SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty} +static unsigned int borderpx = 1; /* border pixel of windows */ +static unsigned int snap = 32; /* snap pixel */ +static unsigned int gappih = 20; /* horiz inner gap between windows */ +static unsigned int gappiv = 10; /* vert inner gap between windows */ +static unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ +static unsigned int gappov = 30; /* vert outer gap between windows and screen edge */ +static int swallowfloating = 0; /* 1 means swallow floating windows by default */ +static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ +static int showbar = 1; /* 0 means no bar */ +static int topbar = 1; /* 0 means bottom bar */ +static const char *fonts[] = { + "SpaceMono Nerd Font:size=8", + "FontAwesome:pixelsize=8:antialias=true:autohint=true" + }; +static char normbgcolor[] = "#000000"; +static char normbordercolor[] = "#000000"; +static char normfgcolor[] = "#eeeeee"; +static char selfgcolor[] = "#eeeeee"; +static char selbordercolor[] = "#000000"; +static char selbgcolor[] = "#000000"; + +static char *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, + [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, }; -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* staticstatus */ -static const int statmonval = 0; +typedef struct { + const char *name; + const void *cmd; +} Sp; +const char *spcmd1[] = {TERMINAL, "-n", "spterm", "-g", "120x34", NULL }; +const char *spcmd2[] = {TERMINAL, "-n", "spcalc", "-f", "monospace:size=16", "-g", "50x20", "-e", "bc", "-lq", NULL }; +static Sp scratchpads[] = { + /* name cmd */ + {"spterm", spcmd1}, + {"spcalc", spcmd2}, +}; /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -64,27 +53,33 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + { "$BROWSER", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ +static float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static int nmaster = 1; /* number of clients in master area */ +static int resizehints = 0; /* 1 means respect size hints in tiled resizals */ #define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ -#include "./patches/vanitygaps.c" +#include "vanitygaps.c" -/* #include "./patches/fibonacci.c" */ static const Layout layouts[] = { /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "[\\]", dwindle }, - { "[M]", monocle }, - { "><>", NULL }, /* no layout function means floating behavior */ - { "|M|", centeredmaster }, - { ">M>", centeredfloatingmaster }, - { NULL, NULL }, + { "[]=", tile }, /* Default: Master on left, slaves on right */ + { "TTT", bstack }, /* Master on top, slaves on bottom */ + + { "[@]", spiral }, /* Fibonacci spiral */ + { "[\\]", dwindle }, /* Decreasing in size right and leftward */ + + { "[D]", deck }, /* Master on left, slaves in monocle-like mode on right */ + { "[M]", monocle }, /* All windows on top of eachother */ + + { "|M|", centeredmaster }, /* Master in middle, slaves on sides */ + { ">M>", centeredfloatingmaster }, /* Same but master floats */ + + { "><>", NULL }, /* no layout function means floating behavior */ + { NULL, NULL }, }; /* key definitions */ @@ -94,6 +89,10 @@ static const Layout layouts[] = { { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#define STACKKEYS(MOD,ACTION) \ + { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ + { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ + { MOD, XK_v, ACTION##stack, {.i = 0 } }, \ /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -101,77 +100,126 @@ static const Layout layouts[] = { /* commands */ static const char *termcmd[] = { TERMINAL, NULL }; +/* + * Xresources preferences to load at startup + */ +ResourcePref resources[] = { + { "color0", STRING, &normbordercolor }, + { "color8", STRING, &selbordercolor }, + { "color0", STRING, &normbgcolor }, + { "color4", STRING, &normfgcolor }, + { "color0", STRING, &selfgcolor }, + { "color4", STRING, &selbgcolor }, + { "borderpx", INTEGER, &borderpx }, + { "snap", INTEGER, &snap }, + { "showbar", INTEGER, &showbar }, + { "topbar", INTEGER, &topbar }, + { "nmaster", INTEGER, &nmaster }, + { "resizehints", INTEGER, &resizehints }, + { "mfact", FLOAT, &mfact }, + { "gappih", INTEGER, &gappih }, + { "gappiv", INTEGER, &gappiv }, + { "gappoh", INTEGER, &gappoh }, + { "gappov", INTEGER, &gappov }, + { "swallowfloating", INTEGER, &swallowfloating }, + { "smartgaps", INTEGER, &smartgaps }, +}; + #include -#include "./patches/shiftview.c" +#include "shiftview.c" + static Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_b, spawn, SHCMD("feh --bg-fill --randomize ~/Pictures/wallpapers/* &") }, - { MODKEY|ShiftMask, XK_b, togglebar, {0} }, - { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - { MODKEY, XK_q, killclient, {0} }, - { MODKEY, XK_space, spawn, SHCMD("dmenu_run") }, - { MODKEY|ShiftMask, XK_space, setlayout, {0} }, - { MODKEY, XK_w, spawn, SHCMD("$BROWSER") }, - { MODKEY, XK_r, spawn, SHCMD("$TERMINAL -e ranger") }, - { MODKEY, XK_y, spawn, SHCMD("flameshot gui -p ~/Pictures/screenshots") }, - { MODKEY|ShiftMask, XK_y, spawn, SHCMD("flameshot full -p ~/Pictures/screenshots") }, - { MODKEY|ShiftMask, XK_v, spawn, SHCMD("mpv /dev/video0") }, - { MODKEY, XK_semicolon, spawn, SHCMD("skippy-xd") }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY, XK_n, shiftview, {.i = +1 } }, - { MODKEY, XK_p, shiftview, {.i = -1 } }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, // tile - { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, // tile - { MODKEY, XK_f, setlayout, {.v = &layouts[2]} }, // float - { MODKEY|ShiftMask, XK_f, togglefloating, {0} }, - { MODKEY, XK_c, setlayout, {.v = &layouts[4]} }, // monocle - { MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[5]} }, // dwindle - { MODKEY, XK_g, togglegaps, {0} }, - { MODKEY|ShiftMask, XK_g, defaultgaps, {0} }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } }, - { 0, XF86XK_AudioMute, spawn, {.v = mutevol } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol } }, - { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } }, - { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.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, XK_F2, spawn, SHCMD("screenkey -s small --scr 1 -p fixed -g 600x100+2573+1330 --opacity .9 --font-color white") }, - { MODKEY, XK_F3, spawn, SHCMD("killall screenkey") }, - { MODKEY|ShiftMask, XK_q, quit, {0} }, + STACKKEYS(MODKEY, focus) + STACKKEYS(MODKEY|ShiftMask, push) + { MODKEY, XK_grave, spawn, SHCMD("dmenuunicode") }, + 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, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_BackSpace, spawn, SHCMD("sysact") }, + { MODKEY|ShiftMask, XK_BackSpace, spawn, SHCMD("sysact") }, + { MODKEY|ShiftMask, XK_q, spawn, SHCMD("sysact") }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY, XK_q, killclient, {0} }, + + { MODKEY, XK_w, spawn, SHCMD("$BROWSER") }, + { MODKEY, XK_r, spawn, SHCMD(TERMINAL " -e ranger") }, + { MODKEY|ShiftMask, XK_r, spawn, SHCMD(TERMINAL " -e btm") }, + { MODKEY, XK_n, spawn, SHCMD(TERMINAL " -e gpuwatch") }, + { MODKEY, XK_space, spawn, SHCMD("dmenu_run") }, + + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, /* tile */ + { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */ + { MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */ + { MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */ + { MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */ + { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */ + { MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */ + { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */ + { MODKEY, XK_o, incnmaster, {.i = +1 } }, + { MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } }, + { MODKEY, XK_backslash, view, {0} }, + { MODKEY, XK_a, togglegaps, {0} }, + { MODKEY|ShiftMask, XK_a, defaultgaps, {0} }, + { MODKEY, XK_s, togglesticky, {0} }, + { MODKEY, XK_f, togglefullscr, {0} }, + { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[8]} }, + { MODKEY, XK_g, shiftview, { .i = -1 } }, + { MODKEY|ShiftMask, XK_g, shifttag, { .i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY, XK_semicolon, shiftview, { .i = 1 } }, + { MODKEY|ShiftMask, XK_semicolon, shifttag, { .i = 1 } }, + { MODKEY, XK_apostrophe, togglescratch, {.ui = 1} }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_Return, togglescratch, {.ui = 0} }, + { MODKEY, XK_z, incrgaps, {.i = +3 } }, + { MODKEY, XK_x, incrgaps, {.i = -3 } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + + { MODKEY|ShiftMask, XK_m, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, + { MODKEY, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") }, + { MODKEY|ShiftMask, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") }, + { MODKEY, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") }, + { MODKEY|ShiftMask, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") }, + { 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, + { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)") }, + { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)") }, }; /* button definitions */ /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ static Button buttons[] = { /* click event mask button function argument */ - { ClkLtSymbol, 0, Button1, setlayout, {0} }, - { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, +#ifndef __OpenBSD__ { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} }, + { ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} }, + { ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} }, + { ClkStatusText, 0, Button4, sigdwmblocks, {.i = 4} }, + { ClkStatusText, 0, Button5, sigdwmblocks, {.i = 5} }, + { ClkStatusText, ShiftMask, Button1, sigdwmblocks, {.i = 6} }, +#endif + { ClkStatusText, ShiftMask, Button3, spawn, SHCMD(TERMINAL " -e nvim ~/.local/src/dwmblocks/config.h") }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button2, defaultgaps, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkClientWin, MODKEY, Button4, incrgaps, {.i = +1} }, + { ClkClientWin, MODKEY, Button5, incrgaps, {.i = -1} }, { ClkTagBar, 0, Button1, view, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} }, { ClkTagBar, MODKEY, Button1, tag, {0} }, { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + { ClkTagBar, 0, Button4, shiftview, {.i = -1} }, + { ClkTagBar, 0, Button5, shiftview, {.i = 1} }, + { ClkRootWin, 0, Button2, togglebar, {0} }, }; -- cgit v1.2.3-70-g09d2