diff options
| author |  Tom Willemsen | 2012-10-12 08:52:53 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-12 08:52:53 +0200 |
| commit | 77c39ea0f082446f21981bd0876a4f1fde3c4807 (patch) | |
| tree | 8843848d7c92d6be20a3e23bd22c0c9e5218022d /.config/awesome/rc.lua | |
| parent | 8bcf0ae40fc2e9c6565567131218029768859839 (diff) | |
| parent | 1f3bdb9e4490e20aefd7038a507aee50c76728dc (diff) | |
| download | dotfiles-77c39ea0f082446f21981bd0876a4f1fde3c4807.tar.gz dotfiles-77c39ea0f082446f21981bd0876a4f1fde3c4807.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.config/cower/config
.emacs.d/init.el
Diffstat (limited to '.config/awesome/rc.lua')
| -rw-r--r-- | .config/awesome/rc.lua | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 24ff5fe..1c6e4fe 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -202,13 +202,11 @@ local bind = keychain local sub = keychain.sub globalkeys = awful.util.table.join( bind({ "Control", }, "i", - { sub({ }, "o", - function () - awful.client.focus.byidx(1) - if client.focus then client.focus:raise() end - end), - sub({ "Shift", }, "o", + { sub({ }, "space", ext.next_client), + sub({ }, ",", function () awful.screen.focus_relative(1) end), + sub({ }, ".", + function () awful.screen.focus_relative(-1) end), sub({ "Shift", }, "1", function () mypromptbox[mouse.screen]:run() end), sub({ }, "f", function () oni.focus_raise("right") end), @@ -220,7 +218,8 @@ globalkeys = awful.util.table.join( sub({ }, "e", oni.ror_editor), sub({ "Shift", }, "e", oni.run_editor), sub({ }, "w", oni.ror_browser), - sub({ "Shift", }, "w", oni.run_browser) }), + sub({ "Shift", }, "w", oni.run_browser), + sub({ "Control", }, "i", ext.prev_client) }), awful.key({ "Control", "Mod1" }, "l", function () awful.util.spawn("i3lock -c 000000") end), awful.key({ modkey, }, "Left", awful.tag.viewprev ), @@ -233,13 +232,6 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), awful.key({ modkey, }, "u", awful.client.urgent.jumpto), - awful.key({ modkey, }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end), -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), |