@@ 1,10 1,11 @@
# HG changeset patch
# Parent 22a2ef4cdc934d965406e5e26ef7db67429f767e
+# Parent 5195c62d896bc95b0f0baec3e41132b3ad4b31d2
-diff -r 22a2ef4cdc93 config.def.h
---- a/config.def.h Mon May 27 10:57:00 2013 +1200
-+++ b/config.def.h Thu Aug 01 09:39:17 2013 +1200
-@@ -9,40 +9,45 @@
+diff -r 5195c62d896b config.def.h
+--- a/config.def.h Thu Aug 01 09:48:07 2013 +1200
++++ b/config.def.h Mon Mar 02 21:18:07 2015 +1300
+@@ -9,40 +9,42 @@
static const char selbgcolor[] = "#005577";
static const char selfgcolor[] = "#eeeeee";
static const unsigned int borderpx = 1; /* border pixel of windows */
@@ 28,10 29,7 @@ diff -r 22a2ef4cdc93 config.def.h
+ { "Vimprobable", NULL, NULL, 1 << 1, False, -1 },
+ { "Chromium", NULL, NULL, 1 << 0, False, -1 },
+ { "tabbed", NULL, NULL, 1 << 1, False, -1 },
-+ { "Skype", NULL, NULL, 1 << 0, True, -1 },
-+ { "Filezilla", NULL, NULL, 1 << 0, True, -1 },
-+ { "MPlayer", NULL, NULL, 1 << 0, True, -1 },
-+ { "Truecrypt", NULL, NULL, 1 << 0, True, -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 },
@@ 64,7 62,7 @@ diff -r 22a2ef4cdc93 config.def.h
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
-@@ -51,12 +56,29 @@
+@@ -51,12 +53,28 @@
/* commands */
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
@@ 91,7 89,6 @@ diff -r 22a2ef4cdc93 config.def.h
+ { 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_a, spawn, SHCMD("$HOME/Scripts/autostart") },
+ { ControlMask|Mod1Mask, XK_w, spawn, SHCMD("$(tabbed -c -d -p -2 >/tmp/tabbed.xid); vimprobable2 -e $(</tmp/tabbed.xid)") },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
@@ 3,7 3,7 @@
diff -r 968c9ff01580 config.def.h
--- a/config.def.h Fri Sep 20 08:55:52 2013 +1200
-+++ b/config.def.h Fri Oct 25 16:41:34 2013 +1300
++++ b/config.def.h Tue Nov 11 19:56:30 2014 +1300
@@ -1,7 +1,7 @@
/* See LICENSE file for copyright and license details. */
@@ 40,7 40,7 @@ diff -r 968c9ff01580 config.def.h
static const char *lockcmd[] = { "xautolock", "-locknow", NULL };
static const char *rebootcmd[] = { "systemctl", "reboot", NULL };
static const char *shutcmd[] = { "systemctl", "poweroff", NULL };
-@@ -115,6 +117,12 @@
+@@ -115,6 +117,11 @@
{ MODKEY, XK_Right, cycle, {.i = +1 } },
{ MODKEY|ControlMask, XK_Left, tagcycle, {.i = -1 } },
{ MODKEY|ControlMask, XK_Right, tagcycle, {.i = +1 } },
@@ 49,7 49,6 @@ diff -r 968c9ff01580 config.def.h
+ { 0, 0x1008ff13,spawn, SHCMD("$HOME/Scripts/volume up") },
+ { 0, 0x1008ff03,spawn, SHCMD("$HOME/Scripts/brightness down") },
+ { 0, 0x1008ff02,spawn, SHCMD("$HOME/Scripts/brightness up") },
-+ { 0, 0x1008ff59,spawn, SHCMD("$HOME/Scripts/touchpad") },
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2)