X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/51c2a451d33d8257ae40eaa816c793f889032b43..13f8fda788cf16ea7269b4e9b4868cd06195577f:/.config/awesome/rc.lua?ds=sidebyside

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 7cb0048..a56aab0 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -319,10 +319,8 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-    awful.key({ modkey, "Shift"   }, "Right", function () awful.screen.focus( 1)       end),
-    awful.key({ modkey, "Shift"   }, "Left", function () awful.screen.focus(-1)       end),
-    awful.key({ modkey, "Shift"   }, "h",   awful.tag.viewprev       ),
-    awful.key({ modkey, "Shift"   }, "l",  awful.tag.viewnext       ),
+    awful.key({ modkey, "Shift"   }, "Right", function () awful.screen.focus_relative( 1)       end),
+    awful.key({ modkey, "Shift"   }, "Left", function () awful.screen.focus_relative(-1)       end),
 
     awful.key({ modkey,           }, "k",
         function ()
@@ -459,12 +457,10 @@ cmdmodkey = "Mod3"
 
 -- xmms2 & sound
 globalkeys = awful.util.table.join(globalkeys,
-  awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2%+") end),
-  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2%-") end),
-  awful.key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2%+") end),
-  awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2%-") end),
-  awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end),
-  awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end),
+  awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("pactl set-sink-volume 0 +2%") end),
+  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("pactl set-sink-volume 0 -2%") end),
+  awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("pactl set-source-mute 1 toggle") end),
+  awful.key({ cmdmodkey }, "End", function () awful.util.spawn("pactl set-sink-mute 0 toggle") end),
   awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("nyxmms2 prev") end),
   awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("nyxmms2 next") end),
   awful.key({ cmdmodkey }, "space", function () awful.util.spawn("nyxmms2 toggle") end),