awesome: fix bindings for modkey+space and others involving mypromptbox

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index af2426e97a21420088b5e339aacf34083d4571ee..5d9937b32672e33e8fb1f8046ed980a74613e384 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -15,17 +15,14 @@ clientbuttons = awful.util.table.join(
 -- Global Keys {{{1
 globalkeys = awful.util.table.join(globalkeys,
     -- Awesome Keys {{{2
-    awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
-    awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
-
     awful.key({ modkey,           }, "j",
         function ()
-            awful.client.focus.byidx( 1)
+            awful.client.focus.byidx(-1)
             if client.focus then client.focus:raise() end
         end),
     awful.key({ modkey,           }, "k",
         function ()
-            awful.client.focus.byidx(-1)
+            awful.client.focus.byidx( 1)
             if client.focus then client.focus:raise() end
         end),
 
@@ -56,22 +53,30 @@ globalkeys = awful.util.table.join(globalkeys,
 
     awful.key({ modkey }, "x",
               function ()
-                  awful.prompt.run({ prompt = "Run Lua code: " },
-                  mypromptbox[mouse.screen].widget,
-                  awful.util.eval, nil,
-                  awful.util.getdir("cache") .. "/history_eval")
-              end),
+                  awful.prompt.run {
+                    prompt       = "Run Lua code: ",
+                    textbox      = awful.screen.focused().mypromptbox.widget,
+                    exe_callback = awful.util.eval,
+                    history_path = awful.util.get_cache_dir() .. "/history_eval"
+                  }
+              end,
+              {description = "lua execute prompt", group = "awesome"}),
     -- Menubar
-    awful.key({ modkey }, "p", function() menubar.show() end),
+    -- awful.key({ modkey }, "p", function() menubar.show() end),
 
     -- My Keys {{{2
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
+    awful.key({ modkey,           }, "Down",   awful.tag.viewprev       ),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
+    awful.key({ modkey,           }, "Up",     awful.tag.viewnext       ),
+
     -- Menu
     awful.key({ modkey }, "w", function () mymainmenu:show({ coords = { x = 0, y = 0}}) end),
     -- Prompt
-    awful.key({ modkey }, "space", function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey }, "space", function () awful.screen.focused().mypromptbox:run() end),
     -- switch layout
-    awful.key({ modkey }, "]", function () awful.layout.inc(layouts,  1) end),
-    awful.key({ modkey }, "[", function () awful.layout.inc(layouts, -1) end),
+    awful.key({ modkey }, "]", function () awful.layout.inc( 1, mouse.screen, layouts) end),
+    awful.key({ modkey }, "[", function () awful.layout.inc(-1, mouse.screen, layouts) end),
     -- resize slave
     awful.key({ modkey, "Control" }, "j",      function () awful.client.incwfact( 0.05)  end),
     awful.key({ modkey, "Control" }, "k",      function () awful.client.incwfact(-0.05)  end),
@@ -83,13 +88,22 @@ globalkeys = awful.util.table.join(globalkeys,
     -- Layout manipulation
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
     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,           }, "=",      function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (kinesis)
     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)
+    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end),
+    awful.key({ modkey }, "F10",  function () awful.util.spawn("ponymix toggle")     end),
+    awful.key({ modkey }, "F11",  function () awful.util.spawn("ponymix decrease 5") end),
+    awful.key({ modkey }, "F12",  function () awful.util.spawn("ponymix increase 5") end),
+    -- Lock
+    awful.key({ modkey, "Control" }, "Escape", function () awful.util.spawn("xautolock -locknow") end),
+    -- VimWiki
+    awful.key({ modkey }, "i", function ()
+        awful.util.spawn("urxvtc -name vimwiki -e vim -c 'call vimwiki#base#goto_index(v:count1)'")
+    end)
 )
 
 -- Client keys {{{1
@@ -115,6 +129,7 @@ clientkeys = awful.util.table.join(
     -- Move client to screen
     awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),
     awful.key({ modkey, "Shift" }, "#49",      awful.client.movetoscreen ),
+    awful.key({ modkey, "Shift" }, "=",        awful.client.movetoscreen ), -- kinesis
     -- 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)
@@ -129,11 +144,15 @@ for i = 1, 9 do
     globalkeys = awful.util.table.join(globalkeys,
         awful.key({ modkey }, "#" .. i + 9,
                   function ()
-                        local screen = mouse.screen
-                        local tag = awful.tag.gettags(screen)[i]
-                        if tag then
-                           awful.tag.viewonly(tag)
-                        end
+                    local screen = mouse.screen
+                    local tag = awful.tag.gettags(screen)[i]
+                    if tag then
+                      if tag == awful.tag.selected(screen) then
+                        awful.tag.history.restore(screen)
+                      else
+                        awful.tag.viewonly(tag)
+                      end
+                    end
                   end),
         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()