# HG changeset patch # User jasonwryan # Date 1615441423 -46800 # Thu Mar 11 18:43:43 2021 +1300 # Node ID c8a185af1e8438927f2790b8d7017ad5dd735c03 # Parent 203ffb7efbf9082a1ab3b964832dc02e9fdb3902 Updated, long overdue diff --git a/base.config.customizations b/base.config.customizations --- a/base.config.customizations +++ b/base.config.customizations @@ -1,11 +1,11 @@ # HG changeset patch # Parent 22a2ef4cdc934d965406e5e26ef7db67429f767e -# Parent 5195c62d896bc95b0f0baec3e41132b3ad4b31d2 +# Parent ece13c5e2c11a192a684871b9fd59fe45de9b0ad -diff -r 5195c62d896b config.def.h ---- a/config.def.h Thu Aug 01 09:48:07 2013 +1200 -+++ b/config.def.h Thu Mar 11 18:26:14 2021 +1300 -@@ -9,40 +9,41 @@ +diff --git a/config.def.h b/config.def.h +--- a/config.def.h ++++ b/config.def.h +@@ -9,40 +9,38 @@ static const char selbordercolor[] = "# static const char selbgcolor[] = "#005577"; static const char selfgcolor[] = "#eeeeee"; static const unsigned int borderpx = 1; /* border pixel of windows */ @@ -26,9 +26,6 @@ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 1 << 8, False, -1 }, -+ { "firefox", NULL, NULL, 1 << 0, False, -1 }, -+ { "qutebrowser", NULL, NULL, 1 << 1, False, -1 }, -+ { "mpv", NULL, NULL, 1 << 0, True, -1 }, + { NULL, NULL, "mutt", 1 << 3, False, -1 }, + { NULL, NULL, "tmux", 1 << 2, False, -1 }, + { NULL, NULL, "ssh", 1 << 0, False, -1 }, @@ -61,7 +58,7 @@ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, -@@ -51,12 +52,29 @@ +@@ -51,12 +49,26 @@ static const Layout layouts[] = { /* commands */ static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; @@ -71,8 +68,6 @@ +static const char *mailcmd[] = { "urxvtc", "-title", "mutt", "-e", "mutt", NULL }; +static const char *tmuxcmd[] = { "urxvtc", "-title", "tmux", "-e", "tmux", "-f", "/home/jason/.tmux/conf", NULL }; +static const char *padcmd[] = { "urxvtc", "-title", "scratchpad", "-geometry", "56x10-30+40", NULL }; -+static const char *voloffcmd[] = { "amixer", "-c", "0", "set", "Master", "mute", NULL }; -+static const char *webcmd[] = { "run_browser", NULL }; +static const char *lockcmd[] = { "xautolock", "-locknow", NULL }; +static const char *rebootcmd[] = { "systemctl", "reboot", NULL }; +static const char *shutcmd[] = { "systemctl", "poweroff", NULL }; @@ -89,7 +84,6 @@ + { ControlMask|Mod1Mask, XK_p, spawn, {.v = padcmd } }, + { ControlMask|Mod1Mask, XK_r, spawn, {.v = rebootcmd } }, + { ControlMask|Mod1Mask, XK_q, spawn, {.v = shutcmd } }, -+ { ControlMask|Mod1Mask, XK_w, spawn, {.v = webcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, diff --git a/shiv.config b/shiv.config --- a/shiv.config +++ b/shiv.config @@ -1,10 +1,10 @@ # HG changeset patch # Parent 968c9ff015807846610d502ff367b90842dd8c46 -# Parent 82e05d998bd4a5788b2af23104a4b7d23b397ef0 +# Parent 2687cf17fc7bd9307b949922ac6c0aca9f5f7067 -diff -r 82e05d998bd4 config.def.h ---- a/config.def.h Mon Mar 02 21:18:46 2015 +1300 -+++ b/config.def.h Thu Mar 11 18:22:31 2021 +1300 +diff --git a/config.def.h b/config.def.h +--- a/config.def.h ++++ b/config.def.h @@ -1,7 +1,7 @@ /* See LICENSE file for copyright and license details. */ @@ -14,21 +14,17 @@ #define NUMCOLORS 9 static const char colors[NUMCOLORS][ColLast][9] = { // border foreground background -@@ -25,10 +25,10 @@ +@@ -25,6 +25,9 @@ static const char *tags[] = { "base", "w static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ -- { "Vimprobable", NULL, NULL, 1 << 1, False, -1 }, -- { "Chromium", NULL, NULL, 1 << 0, False, -1 }, -- { "tabbed", NULL, NULL, 1 << 1, False, -1 }, + { "firefox", NULL, NULL, 1 << 0, False, -1 }, + { "qutebrowser", NULL, NULL, 1 << 1, False, -1 }, - { "mpv", NULL, NULL, 1 << 0, True, -1 }, + { NULL, NULL, "mpv", 1 << 0, True, -1 }, { NULL, NULL, "mutt", 1 << 3, False, -1 }, { NULL, NULL, "tmux", 1 << 2, False, -1 }, { NULL, NULL, "ssh", 1 << 0, False, -1 }, -@@ -36,7 +36,7 @@ +@@ -32,7 +35,7 @@ static const Rule rules[] = { }; /* layout(s) */ @@ -37,7 +33,7 @@ static const int nmaster = 1; /* number of clients in master area */ static const Bool resizehints = False;/* True means respect size hints in tiled resizals */ -@@ -66,6 +66,8 @@ +@@ -62,6 +65,8 @@ static const char *xtermcmd[] = { "xter static const char *mailcmd[] = { "urxvtc", "-title", "mutt", "-e", "mutt", NULL }; static const char *tmuxcmd[] = { "urxvtc", "-title", "tmux", "-e", "tmux", "-f", "/home/jason/.tmux/conf", NULL }; static const char *padcmd[] = { "urxvtc", "-title", "scratchpad", "-geometry", "56x10-30+40", NULL }; @@ -46,17 +42,7 @@ static const char *lockcmd[] = { "xautolock", "-locknow", NULL }; static const char *rebootcmd[] = { "systemctl", "reboot", NULL }; static const char *shutcmd[] = { "systemctl", "poweroff", NULL }; -@@ -81,8 +83,7 @@ - { ControlMask|Mod1Mask, XK_p, spawn, {.v = padcmd } }, - { ControlMask|Mod1Mask, XK_r, spawn, {.v = rebootcmd } }, - { ControlMask|Mod1Mask, XK_q, spawn, {.v = shutcmd } }, -- { ControlMask|Mod1Mask, XK_s, spawn, SHCMD("$HOME/Scripts/shux") }, -- { ControlMask|Mod1Mask, XK_w, spawn, SHCMD("$(tabbed -c -d -p -2 >/tmp/tabbed.xid); vimprobable2 -e $(