diff --git a/.config/suckless/dwm/config.h b/.config/suckless/dwm/config.h index 33a385e..18fa64b 100644 --- a/.config/suckless/dwm/config.h +++ b/.config/suckless/dwm/config.h @@ -3,7 +3,7 @@ static const unsigned int gappx = 5; static const int showbar = 1; static const int topbar = 1; -static const char *fonts[] = { "CaskaydiaCove NFM style:SemiBold:size=11" }; +static const char *fonts[] = { "Cascadia Mono:style=Bold:size=10:antialias=true:autohint=true" }; static const char *colors[][3] = { [SchemeNorm] = { "#D3C6AA", "#272E33", "#83C092" }, [SchemeSel] = { "#374145", "#DBBC7F", "#A7C080" }, @@ -11,10 +11,10 @@ static const char *colors[][3] = { static const char *tags[] = { "1", "2", "3" }; static const Rule rules[] = { - { "PrismLauncher", "prismlauncher", NULL, 1 << 2, 0, -1 }, - { "librewolf", "Navigator", NULL, 1 << 1, 0, -1 }, - { "steam", "steamwebhelper", NULL, 1 << 2, 0, -1 }, - { "st-256color", "st-256color", NULL, 1, 0, -1 }, + { "st-256color", NULL, NULL, 1, 0, -1 }, + { "librewolf", NULL, NULL, 1 << 1, 0, -1 }, + { "steam", NULL, NULL, 1 << 2, 0, -1 }, + { "PrismLauncher", NULL, NULL, 1 << 2, 0, -1 }, }; static const float mfact = 0.55; @@ -32,39 +32,27 @@ static const Layout layouts[] = { { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ -{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } -static char dmenumon[2] = "0"; -static const char *dmenucmd[] = { "dmenu_run", NULL }; -static const char *termcmd[] = { "st", NULL }; -static const char *browsercmd[] = { "librewolf", NULL }; - #include "X11/XF86keysym.h" static const Key keys[] = { - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_space, spawn, {.v = dmenucmd } }, - { MODKEY, XK_f, spawn, {.v = browsercmd } }, - { MODKEY, XK_h, focusstack, {.i = +1 } }, - { MODKEY, XK_l, focusstack, {.i = -1 } }, - { MODKEY, XK_j, setmfact, {.f = -0.05} }, - { MODKEY, XK_k, setmfact, {.f = +0.05} }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_Return, spawn, SHCMD("st") }, + { MODKEY, XK_space, spawn, SHCMD("dmenu_run") }, + { MODKEY, XK_f, spawn, SHCMD("librewolf") }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_q, killclient, {0} }, { MODKEY|ShiftMask, XK_Return, zoom, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_c, spawn, SHCMD("sh /home/andrew/.config/suckless/dwm/scripts/calc.sh") }, { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("sh /home/andrew/.config/suckless/dwm/scripts/volume.sh up") }, { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("sh /home/andrew/.config/suckless/dwm/scripts/volume.sh down") }, - TAGKEYS( XK_1, 0 ) - TAGKEYS( XK_2, 1 ) - TAGKEYS( XK_3, 2 ) - TAGKEYS( XK_4, 3 ) + TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) }; static const Button buttons[] = { @@ -72,7 +60,6 @@ static const Button buttons[] = { { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkTagBar, 0, Button1, view, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, diff --git a/.config/suckless/dwm/dwm.c b/.config/suckless/dwm/dwm.c index cf88206..172ade8 100644 --- a/.config/suckless/dwm/dwm.c +++ b/.config/suckless/dwm/dwm.c @@ -144,7 +144,6 @@ static long getstate(Window w); static int gettextprop(Window w, Atom atom, char *text, unsigned int size); static void grabbuttons(Client *c, int focused); static void grabkeys(void); -static void incnmaster(const Arg *arg); static void keypress(XEvent *e); static void killclient(const Arg *arg); static void manage(Window w, XWindowAttributes *wa); @@ -905,13 +904,6 @@ grabkeys(void) } } -void -incnmaster(const Arg *arg) -{ - selmon->nmaster = MAX(selmon->nmaster + arg->i, 0); - arrange(selmon); -} - void keypress(XEvent *e) { @@ -1536,8 +1528,6 @@ spawn(const Arg *arg) { struct sigaction sa; - if (arg->v == dmenucmd) - dmenumon[0] = '0' + selmon->num; if (fork() == 0) { if (dpy) close(ConnectionNumber(dpy)); diff --git a/.config/suckless/st/config.h b/.config/suckless/st/config.h index a92a64f..4d08a6b 100644 --- a/.config/suckless/st/config.h +++ b/.config/suckless/st/config.h @@ -1,4 +1,4 @@ -static char *font = "CaskaydiaCove Nerd Font Mono:weight=180:size=11.5:antialias=true:autohint=true"; +static char *font = "Cascadia Mono:style=Bold:size=11:antialias=true:autohint=true"; static int borderpx = 10; /* diff --git a/.local/share/fonts/CascadiaMono-Bold.ttf b/.local/share/fonts/CascadiaMono-Bold.ttf new file mode 100644 index 0000000..70382f8 Binary files /dev/null and b/.local/share/fonts/CascadiaMono-Bold.ttf differ diff --git a/.local/share/fonts/CascadiaMono-BoldItalic.ttf b/.local/share/fonts/CascadiaMono-BoldItalic.ttf new file mode 100644 index 0000000..0f34a9a Binary files /dev/null and b/.local/share/fonts/CascadiaMono-BoldItalic.ttf differ diff --git a/.local/share/fonts/CascadiaMono-ExtraLight.ttf b/.local/share/fonts/CascadiaMono-ExtraLight.ttf new file mode 100644 index 0000000..48f222c Binary files /dev/null and b/.local/share/fonts/CascadiaMono-ExtraLight.ttf differ diff --git a/.local/share/fonts/CascadiaMono-ExtraLightItalic.ttf b/.local/share/fonts/CascadiaMono-ExtraLightItalic.ttf new file mode 100644 index 0000000..5209d45 Binary files /dev/null and b/.local/share/fonts/CascadiaMono-ExtraLightItalic.ttf differ diff --git a/.local/share/fonts/CascadiaMono-Italic.ttf b/.local/share/fonts/CascadiaMono-Italic.ttf new file mode 100644 index 0000000..e72ce8c Binary files /dev/null and b/.local/share/fonts/CascadiaMono-Italic.ttf differ diff --git a/.local/share/fonts/CascadiaMono-Light.ttf b/.local/share/fonts/CascadiaMono-Light.ttf new file mode 100644 index 0000000..4c2a2eb Binary files /dev/null and b/.local/share/fonts/CascadiaMono-Light.ttf differ diff --git a/.local/share/fonts/CascadiaMono-LightItalic.ttf b/.local/share/fonts/CascadiaMono-LightItalic.ttf new file mode 100644 index 0000000..9c04c9e Binary files /dev/null and b/.local/share/fonts/CascadiaMono-LightItalic.ttf differ diff --git a/.local/share/fonts/CascadiaMono-Medium.ttf b/.local/share/fonts/CascadiaMono-Medium.ttf new file mode 100644 index 0000000..a972fb7 Binary files /dev/null and b/.local/share/fonts/CascadiaMono-Medium.ttf differ diff --git a/.local/share/fonts/CascadiaMono-MediumItalic.ttf b/.local/share/fonts/CascadiaMono-MediumItalic.ttf new file mode 100644 index 0000000..685cacf Binary files /dev/null and b/.local/share/fonts/CascadiaMono-MediumItalic.ttf differ diff --git a/.local/share/fonts/CascadiaMono-Regular.ttf b/.local/share/fonts/CascadiaMono-Regular.ttf new file mode 100644 index 0000000..2887505 Binary files /dev/null and b/.local/share/fonts/CascadiaMono-Regular.ttf differ diff --git a/.local/share/fonts/CascadiaMono-SemiBold.ttf b/.local/share/fonts/CascadiaMono-SemiBold.ttf new file mode 100644 index 0000000..2d35e46 Binary files /dev/null and b/.local/share/fonts/CascadiaMono-SemiBold.ttf differ diff --git a/.local/share/fonts/CascadiaMono-SemiBoldItalic.ttf b/.local/share/fonts/CascadiaMono-SemiBoldItalic.ttf new file mode 100644 index 0000000..f9a393d Binary files /dev/null and b/.local/share/fonts/CascadiaMono-SemiBoldItalic.ttf differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-Bold.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-Bold.ttf deleted file mode 100644 index d7ec691..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-Bold.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-BoldItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-BoldItalic.ttf deleted file mode 100644 index a6a9927..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-BoldItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLight.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLight.ttf deleted file mode 100644 index 13070f4..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLight.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf deleted file mode 100644 index 46e139b..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-Italic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-Italic.ttf deleted file mode 100644 index 95a209e..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-Italic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-Light.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-Light.ttf deleted file mode 100644 index 6117377..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-Light.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-LightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-LightItalic.ttf deleted file mode 100644 index 29eb1bc..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-LightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-Regular.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-Regular.ttf deleted file mode 100644 index b1d98df..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-Regular.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBold.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBold.ttf deleted file mode 100644 index b589dd0..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBold.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf deleted file mode 100644 index ee552e0..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLight.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLight.ttf deleted file mode 100644 index 8d616d6..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLight.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLightItalic.ttf deleted file mode 100644 index caab76a..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Bold.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-Bold.ttf deleted file mode 100644 index 52aca34..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Bold.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-BoldItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-BoldItalic.ttf deleted file mode 100644 index d75f329..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-BoldItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLight.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLight.ttf deleted file mode 100644 index 942b426..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLight.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf deleted file mode 100644 index d8b2485..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Italic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-Italic.ttf deleted file mode 100644 index 582b3ac..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Italic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Light.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-Light.ttf deleted file mode 100644 index ff36c60..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Light.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-LightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-LightItalic.ttf deleted file mode 100644 index 8b4bf75..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-LightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf deleted file mode 100644 index d64d440..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBold.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBold.ttf deleted file mode 100644 index f3b508a..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBold.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf deleted file mode 100644 index 5961f8d..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLight.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLight.ttf deleted file mode 100644 index 48c88cc..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLight.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf deleted file mode 100644 index d4ca4c2..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Bold.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Bold.ttf deleted file mode 100644 index 80a2901..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Bold.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf deleted file mode 100644 index 0f4bbc6..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf deleted file mode 100644 index 7f97e40..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf deleted file mode 100644 index 76d6771..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Italic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Italic.ttf deleted file mode 100644 index 84399ad..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Italic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Light.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Light.ttf deleted file mode 100644 index 9e379f0..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Light.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-LightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-LightItalic.ttf deleted file mode 100644 index 3bd2df9..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-LightItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Regular.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Regular.ttf deleted file mode 100644 index 58633ea..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Regular.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBold.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBold.ttf deleted file mode 100644 index 21cedae..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBold.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf deleted file mode 100644 index 92e5b55..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLight.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLight.ttf deleted file mode 100644 index 023d82a..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLight.ttf and /dev/null differ diff --git a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf b/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf deleted file mode 100644 index e0766c4..0000000 Binary files a/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf and /dev/null differ