Jason Ryan avatar Jason Ryan committed 67dfdd4 Merge

Merging Veles changes

Comments (0)

Files changed (2)

File contents unchanged.

 # 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 */
  
  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 } },
 +	{ 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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.