diff --git a/config.def.h b/config.def.h index 5cd686a..54fe0a8 100644 --- a/config.def.h +++ b/config.def.h @@ -59,7 +59,7 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu-frecency", NULL }; +static const char *dmenucmd[] = { "dmenu_run", NULL }; static const char *termcmd[] = { "st", NULL }; static const char *timecmd[] = { "notify_popinfo", NULL }; diff --git a/config.h b/config.h index f1ca072..7c1a0b9 100644 --- a/config.h +++ b/config.h @@ -2,22 +2,15 @@ /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const int showbar = 1; /* 0 means no bar */ +static const unsigned int snap = 16; /* snap pixel */ +static const int showbar = 0; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "Inconsolata:size=10" }; -static const char dmenufont[] = "Hermit:size=10"; -static const char col_white[] = "#FFFFFF"; -static const char col_green[] = "#00FF00"; -static const char col_black[] = "#000000"; -static const char col_gray1[] = "#222222"; -static const char col_gray2[] = "#444444"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; +static const char *fonts[] = { "Anonymous Pro:size=9" }; +/* Pywal colors */ #include "/home/regan/.cache/wal/colors-wal-dwm.h" + /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -26,8 +19,12 @@ static const Rule rules[] = { * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title */ - /* class instance title tags mask isfloating monitor */ - { "stalonetray", NULL, NULL, 1 << 8 , 1, -1 }, + /* class instance title tags mask isfloating monitor */ + { "stalonetray", NULL, NULL, 1 << 8, 1, -1 }, + { "st-256color", NULL, "pulsemixer", 0, 1, -1 }, + { "st-256color", NULL, "ncmpcpp", 0, 1, -1 }, + { "st-256color", NULL, "tmux", 0, 1, -1 }, + { "st-256color", NULL, "htop", 0, 1, -1 }, }; @@ -59,9 +56,22 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() static const char *dmenucmd[] = { "dmenu_run", NULL }; static const char *termcmd[] = { "st", NULL }; -static const char *timecmd[] = { "notify_popinfo", NULL }; -static const char *batcmd[] = { "notify_batinfo", NULL }; - +static const char *webcmd[] = { "qutebrowser", NULL }; +static const char *notcmd[] = { "notinfo", NULL }; +static const char *xcmd[] = { "pkill", "x", NULL }; +static const char *mutecmd[] = { "pulsemixer", "--toggle-mute", NULL }; +static const char *volcmd[] = { "st", "-e", "pulsemixer", NULL }; +static const char *lockcmd[] = { "slock", NULL }; +static const char *filecmd[] = { "st", "-e", "lf", NULL }; +static const char *musiccmd[] = { "st", "-e", "ncmpcpp", NULL }; +static const char *ssacmd[] = { "ssall", NULL }; +static const char *ssscmd[] = { "ssselection", NULL }; +static const char *passcmd[] = { "passmenu", NULL }; +static const char *transcmd[] = { "st", "-e", "transmission-remote-cli", NULL }; +static const char *mailcmd[] = { "st", "-e", "neomutt", NULL }; +static const char *tmuxcmd[] = { "st", "-e", "tmux", "a", NULL }; +static const char *htopcmd[] = { "st", "-e", "htop", NULL }; +static const char *nmcmd[] = { "st", "-e", "nmtui", NULL }; #include "movestack.c" static Key keys[] = { @@ -100,9 +110,23 @@ static Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_x, quit, {0} }, - { MODKEY, XK_F1, spawn, {.v = timecmd } }, - { MODKEY, XK_F2, spawn, {.v = batcmd } }, + { MODKEY, XK_x, quit, {0} }, + { MODKEY|ShiftMask, XK_x, spawn, {.v = xcmd } }, + { MODKEY, XK_z, spawn, {.v = lockcmd } }, + { MODKEY, XK_q, spawn, {.v = webcmd } }, + { MODKEY|ShiftMask, XK_t, spawn, {.v = notcmd } }, + { MODKEY, XK_v, spawn, {.v = volcmd } }, + { MODKEY, XK_r, spawn, {.v = filecmd } }, + { MODKEY|ShiftMask, XK_v, spawn, {.v = musiccmd } }, + { MODKEY, XK_s, spawn, {.v = ssacmd } }, + { MODKEY|ShiftMask, XK_s, spawn, {.v = ssscmd } }, + { MODKEY, XK_y, spawn, {.v = htopcmd } }, + { MODKEY, XK_u, spawn, {.v = tmuxcmd } }, + { MODKEY, XK_p, spawn, {.v = passcmd } }, + { MODKEY, XK_e, spawn, {.v = transcmd } }, + { MODKEY, XK_w, spawn, {.v = mailcmd } }, + { MODKEY, XK_n, spawn, {.v = nmcmd } }, + { MODKEY, XK_c, spawn, {.v = mutecmd } }, }; /* button definitions */ diff --git a/drw.o b/drw.o index 57c7a7d..f8e85dd 100644 Binary files a/drw.o and b/drw.o differ diff --git a/dwm b/dwm index 2ffb6ad..33859fe 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index 04dbc4e..a06e4b5 100644 Binary files a/dwm.o and b/dwm.o differ diff --git a/patches/dwm-6.1-urg-border.diff b/patches/dwm-6.1-urg-border.diff deleted file mode 100644 index c1ed034..0000000 --- a/patches/dwm-6.1-urg-border.diff +++ /dev/null @@ -1,61 +0,0 @@ -From 8b7bc42822cd5924450bbfc9ed598f72254473ba Mon Sep 17 00:00:00 2001 -From: Alexander Huemer -Date: Sat, 7 Mar 2015 21:45:48 +0100 -Subject: [PATCH] Make the borders of urgent windows a different color - ---- - config.def.h | 1 + - dwm.c | 10 ++++++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 875885b..5276f02 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -8,6 +8,7 @@ static const char normfgcolor[] = "#bbbbbb"; - static const char selbordercolor[] = "#005577"; - static const char selbgcolor[] = "#005577"; - static const char selfgcolor[] = "#eeeeee"; -+static const char urgbordercolor[] = "#ff0000"; - static const unsigned int borderpx = 1; /* border pixel of windows */ - static const unsigned int snap = 32; /* snap pixel */ - static const Bool showbar = True; /* False means no bar */ -diff --git a/dwm.c b/dwm.c -index c8fc7d7..0924ace 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -58,7 +58,7 @@ - - /* enums */ - enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ --enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */ -+enum { SchemeNorm, SchemeSel, SchemeUrg, SchemeLast }; /* color schemes */ - enum { NetSupported, NetWMName, NetWMState, - NetWMFullscreen, NetActiveWindow, NetWMWindowType, - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ -@@ -1537,6 +1537,9 @@ setup(void) { - scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor); - scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor); - scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor); -+ scheme[SchemeUrg].border = drw_clr_create(drw, urgbordercolor); -+ scheme[SchemeUrg].bg = drw_clr_create(drw, selbgcolor); -+ scheme[SchemeUrg].fg = drw_clr_create(drw, selfgcolor); - /* init bars */ - updatebars(); - updatestatus(); -@@ -1982,8 +1985,11 @@ updatewmhints(Client *c) { - wmh->flags &= ~XUrgencyHint; - XSetWMHints(dpy, c->win, wmh); - } -- else -+ else { - c->isurgent = (wmh->flags & XUrgencyHint) ? True : False; -+ if (c->isurgent) -+ XSetWindowBorder(dpy, c->win, scheme[SchemeUrg].border->pix); -+ } - if(wmh->flags & InputHint) - c->neverfocus = !wmh->input; - else --- -2.1.4 - diff --git a/util.o b/util.o index 5701e80..569f5c4 100644 Binary files a/util.o and b/util.o differ