rebase: i screwed something up and st wasnt opening

This commit is contained in:
DarthMooMancer
2025-09-14 13:36:51 -04:00
parent 196178abe8
commit a1be5a0420
51 changed files with 14 additions and 37 deletions
+13 -26
View File
@@ -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} },
-10
View File
@@ -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));
+1 -1
View File
@@ -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;
/*