From 98a60e70edb1adf358e47c879fef7225b2d1f769 Mon Sep 17 00:00:00 2001
From: Alexandre Viau <alexandre@alexandreviau.net>
Date: Sun, 11 May 2014 18:40:25 -0400
Subject: [PATCH] Moved more bindings to binds.lua
---
rc.lua.blackburn | 53 --------------------------------------
rc.lua.copland | 53 --------------------------------------
rc.lua.dremora | 53 --------------------------------------
rc.lua.holo | 53 --------------------------------------
rc.lua.multicolor | 53 --------------------------------------
rc.lua.powerarrow-darker | 53 --------------------------------------
rc.lua.rainbow | 53 --------------------------------------
rc.lua.steamburn | 53 --------------------------------------
settings/binds.lua | 55 +++++++++++++++++++++++++++++++++++++++-
9 files changed, 54 insertions(+), 425 deletions(-)
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index 4540042..f9ab6f5 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -293,59 +293,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.copland b/rc.lua.copland
index 617d8fe..114d12f 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -343,59 +343,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.dremora b/rc.lua.dremora
index 02f7439..0d96f7c 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -293,59 +293,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.holo b/rc.lua.holo
index bd2d5d3..1072bf6 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -428,59 +428,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 0e810f7..b1b225e 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -360,59 +360,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index 258e7c4..07663e5 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -351,59 +351,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 53f3970..00cd829 100644
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -291,59 +291,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index a028131..ffd5383 100644
--- a/rc.lua.steamburn
+++ b/rc.lua.steamburn
@@ -304,59 +304,6 @@ require("settings.binds")
-- {{{ Key bindings
globalkeys = awful.util.table.join(globalkeys,
- -- Take a screenshot
- -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
- awful.key({ altkey }, "p", function() os.execute("screenshot") end),
-
- -- Tag browsing
- awful.key({ modkey }, "Left", awful.tag.viewprev ),
- awful.key({ modkey }, "Right", awful.tag.viewnext ),
- awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
- -- Non-empty tag browsing
- awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
- awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
-
- -- Default client focus
- awful.key({ altkey }, "k",
- function ()
- awful.client.focus.byidx( 1)
- if client.focus then client.focus:raise() end
- end),
- awful.key({ altkey }, "j",
- function ()
- awful.client.focus.byidx(-1)
- if client.focus then client.focus:raise() end
- end),
-
- -- By direction client focus
- awful.key({ modkey }, "j",
- function()
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "k",
- function()
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "h",
- function()
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- end),
- awful.key({ modkey }, "l",
- function()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end),
-
- -- Show Menu
- awful.key({ modkey }, "w",
- function ()
- mymainmenu:show({ keygrabber = true })
- end),
-
-- Show/Hide Wibox
awful.key({ modkey }, "b", function ()
mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
diff --git a/settings/binds.lua b/settings/binds.lua
index 2d12c32..2f84a99 100644
--- a/settings/binds.lua
+++ b/settings/binds.lua
@@ -42,7 +42,60 @@ awful.key({ modkey, "Control" }, "r", awesome.restart),
awful.key({ modkey, "Shift" }, "q", awesome.quit),
-- Dropdown terminal
-awful.key({ modkey, }, "z", function () drop(terminal) end)
+awful.key({ modkey, }, "z", function () drop(terminal) end),
+
+-- Take a screenshot
+-- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
+awful.key({ altkey }, "p", function() os.execute("screenshot") end),
+
+-- Tag browsing
+awful.key({ modkey }, "Left", awful.tag.viewprev ),
+awful.key({ modkey }, "Right", awful.tag.viewnext ),
+awful.key({ modkey }, "Escape", awful.tag.history.restore),
+
+-- Non-empty tag browsing
+awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
+awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
+
+-- Default client focus
+awful.key({ altkey }, "k",
+ function ()
+ awful.client.focus.byidx( 1)
+ if client.focus then client.focus:raise() end
+ end),
+awful.key({ altkey }, "j",
+ function ()
+ awful.client.focus.byidx(-1)
+ if client.focus then client.focus:raise() end
+ end),
+
+-- By direction client focus
+awful.key({ modkey }, "j",
+ function()
+ awful.client.focus.bydirection("down")
+ if client.focus then client.focus:raise() end
+ end),
+awful.key({ modkey }, "k",
+ function()
+ awful.client.focus.bydirection("up")
+ if client.focus then client.focus:raise() end
+ end),
+awful.key({ modkey }, "h",
+ function()
+ awful.client.focus.bydirection("left")
+ if client.focus then client.focus:raise() end
+ end),
+awful.key({ modkey }, "l",
+ function()
+ awful.client.focus.bydirection("right")
+ if client.focus then client.focus:raise() end
+ end),
+
+-- Show Menu
+awful.key({ modkey }, "w",
+ function ()
+ mymainmenu:show({ keygrabber = true })
+ end)
)
-- Bind all key numbers to tags.