summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.h77
-rw-r--r--dwm.c12
2 files changed, 49 insertions, 40 deletions
diff --git a/config.h b/config.h
index 1ad3888..2226315 100644
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
-static const unsigned int borderpx = 1; /* border pixel of windows */
+static const unsigned int borderpx = 0; /* border pixel of windows */
static const unsigned int gappx = 15; /* gaps between 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 */
@@ -13,8 +13,10 @@ static const int showsystray = 1; /* 0 means no systray */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
-static const char *fonts[] = { "monospace:size=10" };
-static const char dmenufont[] = "monospace:size=10";
+
+//static const char *fonts[] = { "UbuntuMono Nerd Font:size=16", "FontAwesome:size=24"};
+static const char *fonts[] = {"JetBrainsMono Nerd Font:size=14" , "JoyPixels:pixelsize=16:antialias=true:autohint=true" };
+static const char dmenufont[] = "JetBrainsMono Nerd Font:size=13";
static char normbgcolor[] = "#222222";
static char normbordercolor[] = "#444444";
static char normfgcolor[] = "#bbbbbb";
@@ -31,15 +33,20 @@ static char *colors[][3] = {
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const Rule rules[] = {
- /* xprop(1):
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
- /* class instance title tags mask isfloating isterminal noswallow monitor */
- { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
- { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
- { "St", NULL, NULL, 0, 0, 1, 0, -1 },
- { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
+ /* xprop(1):
+ * WM_CLASS(STRING) = instance, class
+ * WM_NAME(STRING) = title
+ */
+ /* class instance title tags mask isfloating isterminal noswallow monitor */
+
+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
+ { "WhatsApp", NULL, NULL, 1 << 2, 1, 0, 0, -1 },
+ { "TelegramDesktop", NULL, NULL, 0, 1, 0, 0, -1 },
+ { NULL, NULL, "Spotify", 1 << 8, 0, 0, 0, -1 },
+ { "St", NULL, NULL, 0, 0, 1, 0, -1 },
+ { "st-256color", NULL, NULL, 0, 0, 1, 0, -1 },
+ { "stfloat", NULL, NULL, 0, 1, 1, 0, -1 },
+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
};
/* layout(s) */
@@ -54,11 +61,12 @@ static const Layout layouts[] = {
{ "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
- { "HHH", grid },
+ { "[=]", grid },
};
/* key definitions */
-#define MODKEY Mod1Mask
+#define MODKEY Mod4Mask
+#define ALTKEY Mod1Mask
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
@@ -77,25 +85,25 @@ static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "120x34
#include "movestack.c"
static const Key keys[] = {
/* modifier key function argument */
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { ALTKEY, XK_d, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_grave, togglescratch, {.v = scratchpadcmd } },
+ { ALTKEY, XK_s, togglescratch, {.v = scratchpadcmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ 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_a, incnmaster, {.i = +1 } },
+ { MODKEY, XK_s, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
{ MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } },
{ MODKEY, XK_Return, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
- { MODKEY|ShiftMask, XK_c, killclient, {0} },
+ { MODKEY|ShiftMask, XK_w, 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_g, setlayout, {.v = &layouts[3]} },
+ { MODKEY, XK_y, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_u, setlayout, {.v = &layouts[2]} },
+ { MODKEY, XK_i, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
@@ -104,25 +112,26 @@ static const Key keys[] = {
{ MODKEY, XK_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
- { MODKEY, XK_Right, viewnext, {0} },
- { MODKEY, XK_Left, viewprev, {0} },
+ { ALTKEY, XK_Tab, viewnext, {0} },
+ { ALTKEY|ShiftMask, XK_Tab, viewnextnoskip, {0} },
{ MODKEY|ShiftMask, XK_Right, tagtonext, {0} },
{ MODKEY|ShiftMask, XK_Left, tagtoprev, {0} },
- { MODKEY, XK_minus, setgaps, {.i = -1 } },
- { MODKEY, XK_equal, setgaps, {.i = +1 } },
- { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
+ { MODKEY, XK_minus, setgaps, {.i = -1 } },
+ { MODKEY, XK_equal, setgaps, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_minus, setgaps, {.i = 0 } },
+ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = +15 } },
{ MODKEY, XK_F5, xrdb, {.v = NULL } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- TAGKEYS( XK_5, 4)
+ { ALTKEY|ShiftMask, XK_q, quit, {1} },
+ { MODKEY|ControlMask|ShiftMask, XK_q, quit, {0} },
+ 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|ShiftMask, XK_q, quit, {0} },
- { MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
};
/* button definitions */
diff --git a/dwm.c b/dwm.c
index 72f3e89..4e5f723 100644
--- a/dwm.c
+++ b/dwm.c
@@ -238,7 +238,7 @@ static void movemouse(const Arg *arg);
static unsigned int nexttag(void);
static Client *nexttiled(Client *c);
static void pop(Client *c);
-static unsigned int prevtag(void);
+static unsigned int nexttagnoskip(void);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
static Monitor *recttomon(int x, int y, int w, int h);
@@ -295,7 +295,7 @@ static void updatewindowtype(Client *c);
static void updatewmhints(Client *c);
static void view(const Arg *arg);
static void viewnext(const Arg *arg);
-static void viewprev(const Arg *arg);
+static void viewnextnoskip(const Arg *arg);
static Client *wintoclient(Window w);
static Monitor *wintomon(Window w);
static Client *wintosystrayicon(Window w);
@@ -1526,7 +1526,7 @@ pop(Client *c)
}
unsigned int
-prevtag(void)
+nexttagnoskip(void)
{
unsigned int seltag = selmon->tagset[selmon->seltags];
unsigned int usedtags = 0;
@@ -2120,7 +2120,7 @@ tagtoprev(const Arg *arg)
if (selmon->sel == NULL)
return;
- if ((tmp = prevtag()) == selmon->tagset[selmon->seltags])
+ if ((tmp = nexttagnoskip()) == selmon->tagset[selmon->seltags])
return;
tag(&(const Arg){.ui = tmp });
@@ -2821,9 +2821,9 @@ viewnext(const Arg *arg)
}
void
-viewprev(const Arg *arg)
+viewnextnoskip(const Arg *arg)
{
- view(&(const Arg){.ui = prevtag()});
+ view(&(const Arg){.ui = nexttagnoskip()});
}
Client *
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 11:45:20 +0000