Merge branch 'master' into vim-clean

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 9e83c3246d9554530b524c44b6ef0b199b7662ee..41a623663ad277a05bbcad4a9223cb30037a0381 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -72,8 +72,6 @@ globalkeys = awful.util.table.join(globalkeys,
     -- {{{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,7 +85,8 @@ globalkeys = awful.util.table.join(globalkeys,
     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({ modkey, "Control" }, "Left",   function () awful.screen.focus_relative( 1) end),
     awful.key({ modkey, "Control" }, "Right",  function () awful.screen.focus_relative(-1) end),
     -- Volume


@@ -118,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)