Merge branch 'master' into vim-clean

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 44e63388e73fcba10e4b39f80e5adf08f35b4551..41a623663ad277a05bbcad4a9223cb30037a0381 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
     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       ),
     -- {{{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),
     -- {{{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
     -- Prompt
     awful.key({ modkey }, "space", function () mypromptbox[mouse.screen]:run() end),
     -- switch layout


@@ -87,17 +85,14 @@ globalkeys = awful.util.table.join(
     awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
     -- Layout manipulation
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
     awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
     -- Layout manipulation
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),

-    awful.key({ modkey,           }, "#94",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1
+    awful.key({ modkey,           }, "#49",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (chronos)
+    awful.key({ modkey,           }, "#94",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (shada)

     awful.key({ modkey, "Control" }, "Left",   function () awful.screen.focus_relative( 1) end),
     awful.key({ modkey, "Control" }, "Right",  function () awful.screen.focus_relative(-1) end),
     -- 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({ modkey, "Control" }, "Left",   function () awful.screen.focus_relative( 1) end),
     awful.key({ modkey, "Control" }, "Right",  function () awful.screen.focus_relative(-1) end),
     -- 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
 )
 
 -- {{{1 Client keys


@@ -122,6 +117,7 @@ clientkeys = awful.util.table.join(
     -- {{{2 My Client Keys
     -- Move client to screen
     awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),
     -- {{{2 My Client Keys
     -- Move client to screen
     awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),

+    awful.key({ modkey, "Shift" }, "#49",      awful.client.movetoscreen ),

     -- ontop and below
     awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
     awful.key({ modkey,           }, "b",      function (c) c.below = not c.below            end)
     -- ontop and below
     awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
     awful.key({ modkey,           }, "b",      function (c) c.below = not c.below            end)