Changes from x200

1 files changed, 35 insertions, 14 deletions

diff --git a/dwm-6.2/config.h b/dwm-6.2/config.h
index 75cdad3..3754cff 100644
--- a/dwm-6.2/config.h
+++ b/dwm-6.2/config.h
@@ -2,15 +2,15 @@
 
 /* appearance */
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int snap      = 32;       /* snap pixel */
+static const unsigned int snap      = 16;       /* snap pixel */
 static const unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
 static const unsigned int systrayspacing = 2;   /* systray spacing */
 static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
-static const int showsystray        = 1;     /* 0 means no systray */
+static const int showsystray        = 1;        /* 0 means no systray */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 0;        /* 0 means bottom bar */
 static const char *fonts[]          = { "Sudo:size=10" };
-static const char dmenufont[]       = "Sudo:size=10";
+static const char dmenufont[]       = "Sudo:size=16";
 static const char col_gray1[]       = "#222222";
 static const char col_gray2[]       = "#444444";
 static const char col_gray3[]       = "#bbbbbb";
@@ -62,18 +62,37 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
 
-static const char *brightness_up[]  = { "backlight_up.sh", NULL };
-static const char *brightness_dn[]  = { "backlight_down.sh", NULL };
+/*
+#define XF86MonBrightnessUp   0x1008ff02
+#define XF86MonBrightnessDown 0x1008ff03
+static const char *brightness_up[]  = { "brightnessctl", "s", "5%+", NULL };
+static const char *brightness_dn[]  = { "brightnessctl", "s", "5%-", NULL };
+*/
+
+#define XF86AudioLowerVolume 0x1008ff11
+#define XF86AudioRaiseVolume 0x1008ff13
+#define XF86Launch1 0x1008ff41
+static const char *vol_dn[] = { "pactl", "set-sink-volume", "0", "-5%", NULL };
+static const char *vol_up[] = { "pactl", "set-sink-volume", "0", "+5%", NULL };
+static const char *vol_mt[] = { "pactl", "set-sink-mute", "0", "toggle", NULL };
+
+#define XF86ScreenSaver 0x1008ff2d
+static const char *lock[] = { "lock", NULL };
 
 static Key keys[] = {
   /* modifier                     key        function        argument */
 // Commands
-  { MODKEY,                       XK_space,  spawn,          {.v = dmenucmd } },
-  { MODKEY,                       XK_t,      spawn,          {.v = termcmd } },
-  { MODKEY,                       XK_F6,     spawn,          {.v = brightness_dn } },
-  { MODKEY,                       XK_F7,     spawn,          {.v = brightness_up } },
-// Layout
-
+  { MODKEY,                       XK_space,              spawn,          {.v = dmenucmd } },
+  { MODKEY,                       XK_t,                  spawn,          {.v = termcmd } },
+  { 0,                            XF86AudioLowerVolume,  spawn,          {.v = vol_dn } },
+  { 0,                            XF86AudioRaiseVolume,  spawn,          {.v = vol_up } },
+  { 0,                            XF86Launch1,           spawn,          {.v = vol_mt } },
+  { 0,                            XF86ScreenSaver,       spawn,          {.v = lock } },
+/*
+  { 0,                            XF86MonBrightnessDown, spawn,          {.v = brightness_dn } },
+  { 0,                            XF86MonBrightnessUp,   spawn,          {.v = brightness_up } },
+*/
+// Windows
   { MODKEY,                       XK_n,      focusstack,     {.i = +1 } },
   { MODKEY,                       XK_o,      focusstack,     {.i = -1 } },
   { MODKEY|ShiftMask,             XK_e,      incnmaster,     {.i = +1 } },
@@ -83,15 +102,16 @@ static Key keys[] = {
   { MODKEY,                       XK_Return, zoom,           {0} },
   { MODKEY,                       XK_Tab,    view,           {0} },
   { MODKEY|ShiftMask,             XK_k,      killclient,     {0} },
+// Layout
   { MODKEY,                       XK_a,      setlayout,      {.v = &layouts[0]} },
   { MODKEY,                       XK_r,      setlayout,      {.v = &layouts[1]} },
   { MODKEY,                       XK_s,      setlayout,      {.v = &layouts[2]} },
-  //  { MODKEY,                       XK_d,  setlayout,      {0} },
   { MODKEY,                       XK_d,      togglefloating, {0} },
-  { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-  { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
   { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
   { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+// Tags
+  { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+  { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
   { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
   { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
   TAGKEYS(                        XK_l,                      0)
@@ -117,6 +137,7 @@ static Button buttons[] = {
   { ClkClientWin,         MODKEY,           Button1,        movemouse,      {0} },
   { ClkClientWin,         MODKEY,           Button2,        togglefloating, {0} },
   { ClkClientWin,         MODKEY|ShiftMask, Button1,        resizemouse,    {0} },
+  { ClkClientWin,         MODKEY,           Button2,        resizemouse,    {0} },
   { ClkTagBar,            0,                Button1,        view,           {0} },
   { ClkTagBar,            0,                Button3,        toggleview,     {0} },
   { ClkTagBar,            MODKEY,           Button1,        tag,            {0} },