From eb14361913864c7ab6e33dd7e93d256deec3d53c Mon Sep 17 00:00:00 2001
From: luke bonham <dada@archlinux.info>
Date: Wed, 24 Jun 2015 13:51:06 +0200
Subject: [PATCH] lain: new commit

---
 lain                     |  2 +-
 rc.lua.blackburn         |  9 ++++-----
 rc.lua.copland           |  9 ++++-----
 rc.lua.dremora           |  9 ++++-----
 rc.lua.holo              |  9 ++++-----
 rc.lua.multicolor        |  9 ++++-----
 rc.lua.powerarrow-darker |  9 ++++-----
 rc.lua.rainbow           | 10 +++++-----
 rc.lua.steamburn         |  9 ++++-----
 9 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/lain b/lain
index c3ddefb..5fc5440 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit c3ddefb68d7020b125335f30355abd7aa21b0820
+Subproject commit 5fc544049aa9a70df55907c8171703604aec7b26
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index 1e0648e..f20c210 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -428,23 +428,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1+", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%+", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1-", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%-", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volumewidget.card, volumewidget.channel))
-            --os.execute(string.format("amixer set %s toggle", volumewidget.channel))
+            os.execute(string.format("amixer set %s toggle", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100%%", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 100%%", volumewidget.channel))
             volumewidget.update()
         end),
 
diff --git a/rc.lua.copland b/rc.lua.copland
index a693f1c..a96e593 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -498,23 +498,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s %s+", volume.card, volume.channel, volume.step))
+            os.execute(string.format("amixer set %s %s+", volume.channel, volume.step))
             volume.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s %s-", volume.card, volume.channel, volume.step))
+            os.execute(string.format("amixer set %s %s-", volume.channel, volume.step))
             volume.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volume.card, volume.channel))
-            --os.execute(string.format("amixer set %s toggle", volume.channel))
+            os.execute(string.format("amixer set %s toggle", volume.channel))
             volume.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100", volume.card, volume.channel))
+            os.execute(string.format("amixer set %s 100%%", volume.channel))
             volume.update()
         end),
 
diff --git a/rc.lua.dremora b/rc.lua.dremora
index 10e9a2d..47dee20 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -428,23 +428,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1+", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%+", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1-", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%-", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volumewidget.card, volumewidget.channel))
-            --os.execute(string.format("amixer set %s toggle", volumewidget.channel))
+            os.execute(string.format("amixer set %s toggle", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100%%", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 100%%", volumewidget.channel))
             volumewidget.update()
         end),
 
diff --git a/rc.lua.holo b/rc.lua.holo
index 63e6c8d..1ea62bf 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -561,23 +561,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s %s+", myvolumebar.card, myvolumebar.channel, myvolumebar.step))
+            os.execute(string.format("amixer set %s %s+", myvolumebar.channel, myvolumebar.step))
             myvolumebar.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s %s-", myvolumebar.card, myvolumebar.channel, myvolumebar.step))
+            os.execute(string.format("amixer set %s %s-", myvolumebar.channel, myvolumebar.step))
             myvolumebar.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", myvolumebar.card, myvolumebar.channel))
-            --os.execute(string.format("amixer set %s toggle", myvolumebar.channel))
+            os.execute(string.format("amixer set %s toggle", myvolumebar.channel))
             myvolumebar.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100", myvolumebar.card, myvolumebar.channel))
+            os.execute(string.format("amixer set %s 100%%", myvolumebar.channel))
             myvolumebar.update()
         end),
 
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 691f5eb..a25b9da 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -511,23 +511,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1+", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%+", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1-", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%-", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volumewidget.card, volumewidget.channel))
-            --os.execute(string.format("amixer set %s toggle", volumewidget.channel))
+            os.execute(string.format("amixer set %s toggle", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100%%", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 100%%", volumewidget.channel))
             volumewidget.update()
         end),
 
diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index ee246f1..4ed8b2c 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -482,23 +482,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1+", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%+", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1-", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%-", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volumewidget.card, volumewidget.channel))
-            --os.execute(string.format("amixer set %s toggle", volumewidget.channel))
+            os.execute(string.format("amixer set %s toggle", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100%%", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 100%%", volumewidget.channel))
             volumewidget.update()
         end),
 
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 8a36bdd..813cd92 100644
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -423,26 +423,26 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey,           }, "h",      function () fshome.show(7) end),
     awful.key({ altkey,           }, "w",      function () yawn.show(7) end),
 
+
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s %s+", volume.card, volume.channel, volume.step))
+            os.execute(string.format("amixer set %s %s+", volume.channel, volume.step))
             volume.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s %s-", volume.card, volume.channel, volume.step))
+            os.execute(string.format("amixer set %s %s-", volume.channel, volume.step))
             volume.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volume.card, volume.channel))
-            --os.execute(string.format("amixer set %s toggle", volume.channel))
+            os.execute(string.format("amixer set %s toggle", volume.channel))
             volume.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100", volume.card, volume.channel))
+            os.execute(string.format("amixer set %s 100%%", volume.channel))
             volume.update()
         end),
 
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index c552c9c..937371f 100644
--- a/rc.lua.steamburn
+++ b/rc.lua.steamburn
@@ -435,23 +435,22 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1+", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%+", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer -c %s set %s 1-", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 1%%-", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s toggle", volumewidget.card, volumewidget.channel))
-            --os.execute(string.format("amixer set %s toggle", volumewidget.channel))
+            os.execute(string.format("amixer set %s toggle", volumewidget.channel))
             volumewidget.update()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer -c %s set %s 100%%", volumewidget.card, volumewidget.channel))
+            os.execute(string.format("amixer set %s 100%%", volumewidget.channel))
             volumewidget.update()
         end),