# HG changeset patch
# User jasonwryan <jasonwryan@gmail.com>
# Date 1352370122 -46800
#      Thu Nov 08 23:22:02 2012 +1300
# Node ID 67dfdd468455810dc49892101b0fc298a5d3aa69
# Parent  97c26e9cbe479b1d432ee10979662d71c2dcb785
# Parent  4682e99cb912ee739ad7017e17ff0fb3d879aa8b
Merging Veles changes

diff --git a/veles.config b/veles.config
--- a/veles.config
+++ b/veles.config
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent e002a37f3466d2c6e56dc22d2fefe53ca41e6ee7
+# Parent 95b1118e4be7e553fac39cd5cacb86beb9afce0c
 
-diff -r e002a37f3466 config.def.h
---- a/config.def.h	Thu Oct 18 13:37:56 2012 +1300
-+++ b/config.def.h	Thu Oct 18 13:40:03 2012 +1300
+diff -r 95b1118e4be7 config.def.h
+--- a/config.def.h	Fri Nov 02 16:30:21 2012 +1300
++++ b/config.def.h	Fri Nov 02 16:31:20 2012 +1300
 @@ -21,7 +21,7 @@
  static const Bool topbar            = True;     /* False means bottom bar */
  
@@ -35,21 +35,20 @@
  static const int nmaster      = 1;    /* number of clients in master area */
  static const Bool resizehints = False;/* True means respect size hints in tiled resizals */
  
-@@ -69,7 +75,12 @@
- static const char   *mailcmd[] = { "urxvtc", "-title", "mutt", "-e", "mutt", NULL };
+@@ -69,6 +75,12 @@
  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   *lockcmd[] = { "xautolock", "-locknow", NULL };
+ static const char   *lockcmd[] = { "xautolock", "-locknow", NULL };
 +static const char *voloffcmd[] = { "amixer", "-q", "sset", "Master", "toggle", NULL };
 +static const char  *mpconcmd[] = { "mpc", "toggle", NULL };
 +static const char *mpcoffcmd[] = { "mpc", "stop", NULL };
 +static const char *mpcnexcmd[] = { "mpc", "next", NULL };
 +static const char *mpcprecmd[] = { "mpc", "prev", NULL };
-+static const char   *lockcmd[] = { "i3lock", "-c", "302B54", NULL };
- static const char *rebootcmd[] = { "sudo", "shutdown", "-r", "now", NULL };
- static const char   *shutcmd[] = { "sudo", "shutdown", "-h", "now", NULL };
++static const char  *sleepcmd[] = { "systemctl", "suspend", NULL };
+ static const char *rebootcmd[] = { "systemctl", "reboot", NULL };
+ static const char   *shutcmd[] = { "systemctl", "poweroff", NULL };
  
-@@ -115,6 +126,16 @@
+@@ -113,6 +125,17 @@
  	{ MODKEY,                       XK_Right,  cycle,          {.i = +1 } },
  	{ MODKEY|ControlMask,           XK_Left,   tagcycle,       {.i = -1 } },
  	{ MODKEY|ControlMask,           XK_Right,  tagcycle,       {.i = +1 } },
@@ -63,6 +62,7 @@
 +	{ 0,                            0x1008ff15,spawn,          {.v = mpcoffcmd } },
 +	{ 0,                            0x1008ff16,spawn,          {.v = mpcprecmd } },
 +	{ 0,                            0x1008ff17,spawn,          {.v = mpcnexcmd } },
++	{ 0,                            0x1008ff2f,spawn,          {.v = sleepcmd } },
  	TAGKEYS(                        XK_1,                      0)
  	TAGKEYS(                        XK_2,                      1)
  	TAGKEYS(                        XK_3,                      2)