diff --git a/config.h b/config.h index 0167977..ae4f048 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ #include /* appearance */ -static const unsigned int borderpx = 2; /* border pixel of windows */ +static const unsigned int borderpx = 0; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ @@ -16,8 +16,8 @@ static const unsigned int gappov = 10; /* vert outer gap between windows 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[] = {"FiraCode Nerd Font Mono:size=10"}; -static const char dmenufont[] = "FiraCode Nerd Font Mono:size=10"; +static const char *fonts[] = {"IosevkaTermSlab Nerd Font Mono:size=10"}; +static const char dmenufont[] = "IosevkaTermSlab Nerd Font Mono:size=10"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -45,9 +45,9 @@ static const Rule rules[] = { /* 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 const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ -static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */ +static const int refreshrate = 60; /* refresh rate (per second) for client move/resize */ #define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ #include "vanitygaps.c" @@ -74,11 +74,6 @@ static const Layout layouts[] = { 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_gray2, NULL}; static const char *termcmd[] = {"st", NULL}; -static const char *up_vol[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "+10%", NULL}; -static const char *down_vol[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "-10%", NULL}; -static const char *mute_vol[] = {"pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL}; -static const char *brighter[] = {"brightnessctl", "set", "10%+", NULL}; -static const char *dimmer[] = {"brightnessctl", "set", "10%-", NULL}; static const Key keys[] = { /* modifier key function argument */ @@ -95,21 +90,13 @@ static const Key keys[] = { {MODKEY | ShiftMask, XK_l, setcfact, {.f = -0.25}}, {MODKEY | ShiftMask, XK_o, setcfact, {.f = 0.00}}, {MODKEY | ShiftMask, XK_Return, zoom, {0}}, - {MODKEY | Mod4Mask, XK_u, incrgaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_i, incrigaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_o, incrogaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_6, incrihgaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_7, incrivgaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_8, incrohgaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_9, incrovgaps, {.i = +1}}, - {MODKEY | Mod4Mask, XK_0, togglegaps, {0}}, {MODKEY, XK_Tab, view, {0}}, {MODKEY, XK_q, 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_v, togglefloating, {0}}, {MODKEY, XK_0, view, {.ui = ~0}}, {MODKEY | ShiftMask, XK_0, tag, {.ui = ~0}}, {MODKEY, XK_comma, focusmon, {.i = -1}}, @@ -120,11 +107,11 @@ static const Key keys[] = { // screenshot and multimedia keys {Mod1Mask | ShiftMask, XK_s, spawn, SHCMD("shotgun -s - | xclip -t 'image/png' -selection clipboard")}, {Mod4Mask | ShiftMask, XK_s, spawn, SHCMD("shotgun -g $(hacksaw) - | xclip -t 'image/png' -selection clipboard")}, - {0, XF86XK_AudioMute, spawn, {.v = mute_vol}}, - {0, XF86XK_AudioLowerVolume, spawn, {.v = down_vol}}, - {0, XF86XK_AudioRaiseVolume, spawn, {.v = up_vol}}, - {0, XF86XK_MonBrightnessDown, spawn, {.v = dimmer}}, - {0, XF86XK_MonBrightnessUp, spawn, {.v = brighter}}, + {0, XF86XK_AudioMute, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")}, + {0, XF86XK_AudioLowerVolume, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-")}, + {0, XF86XK_AudioRaiseVolume, spawn, SHCMD("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+")}, + {0, XF86XK_MonBrightnessDown, spawn, SHCMD("brightnessctl s 10%-")}, + {0, XF86XK_MonBrightnessUp, spawn, SHCMD("brightnessctl s 10%-")}, }; diff --git a/dwm b/dwm index 1e704d3..06c1efe 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index 67ec344..7e896ef 100644 Binary files a/dwm.o and b/dwm.o differ diff --git a/vanitygaps.c b/vanitygaps.c index 1a816b6..5ab6f30 100644 --- a/vanitygaps.c +++ b/vanitygaps.c @@ -819,4 +819,4 @@ tile(Monitor *m) resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); sy += HEIGHT(c) + ih; } -} \ No newline at end of file +}