mutt: use column with for html rendering

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 44e63388e73fcba10e4b39f80e5adf08f35b4551..fd2246edd5ff4563859ebf0262d33187372920fd 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -18,7 +18,7 @@ clientbuttons = awful.util.table.join(
     awful.button({ modkey }, 3, awful.mouse.client.resize))
 
 -- {{{1 Global Keys
-globalkeys = awful.util.table.join(
+globalkeys = awful.util.table.join(globalkeys,
     -- {{{2 Awesome Keys
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
@@ -72,8 +72,6 @@ globalkeys = awful.util.table.join(
     -- {{{2 My Keys
     -- Menu
     awful.key({ modkey }, "w", function () mymainmenu:show({ coords = { x = 0, y = 0}}) end),
-    -- Lock
-    awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("i3lock -c 000000") end),
     -- Prompt
     awful.key({ modkey }, "space", function () mypromptbox[mouse.screen]:run() end),
     -- switch layout
@@ -93,11 +91,7 @@ globalkeys = awful.util.table.join(
     -- Volume
     awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),
     awful.key({ }, "XF86AudioLowerVolume",  function () awful.util.spawn("ponymix decrease 5") end),
-    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end),
-    -- mpd
-    awful.key({ }, "XF86AudioPlay",         function () awful.util.spawn("mpc toggle") end),
-    awful.key({ }, "XF86AudioNext",         function () awful.util.spawn("mpc next")   end),
-    awful.key({ }, "XF86AudioPrev",         function () awful.util.spawn("mpc prev")   end)
+    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end)
 )
 
 -- {{{1 Client keys