From 80037fa568e9f4236761d5d20d7d6d7435746325 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Thu, 12 Jan 2017 13:09:44 +0100 Subject: [PATCH] lain: new commit --- lain | 2 +- rc.lua.blackburn | 16 +++++++--------- rc.lua.copland | 15 +++++++-------- rc.lua.dremora | 15 +++++++-------- rc.lua.holo | 13 ++++++------- rc.lua.multicolor | 15 +++++++-------- 6 files changed, 35 insertions(+), 41 deletions(-) diff --git a/lain b/lain index 25af545..354fa23 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 25af54505b724080278de5a6d3a34931d3537609 +Subproject commit 354fa23548674b83620ea69d42cffdd707e13dbf diff --git a/rc.lua.blackburn b/rc.lua.blackburn index a57e35b..32a4ab6 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -55,7 +55,6 @@ run_once("unclutter -root") -- }}} -- {{{ Variable definitions - -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/blackburn/theme.lua") @@ -76,10 +75,9 @@ lain.layout.termfair.ncol = 1 lain.layout.centerfair.nmaster = 3 lain.layout.centerfair.ncol = 1 --- quake terminal -local quakeconsole = {} +-- quake application for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal }) + s.quake = lain.util.quake({ app = terminal }) end -- }}} @@ -492,13 +490,13 @@ globalkeys = awful.util.table.join( end, {description = "restore minimized", group = "client"}), - -- Dropdown terminal - awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), + -- Dropdown application + awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7) end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "h", function () fshome.show(7) end), + awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.copland b/rc.lua.copland index e23f540..ff85e23 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -78,10 +78,9 @@ lain.layout.termfair.ncol = 1 lain.layout.centerfair.nmaster = 3 lain.layout.centerfair.ncol = 1 --- quake terminal -local quakeconsole = {} +-- quake application for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal }) + s.quake = lain.util.quake({ app = terminal }) end -- }}} @@ -558,13 +557,13 @@ globalkeys = awful.util.table.join( end, {description = "restore minimized", group = "client"}), - -- Dropdown terminal - awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), + -- Dropdown application + awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7) end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "h", function () fshome.show(7) end), + awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.dremora b/rc.lua.dremora index e5a6392..451ef20 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -76,10 +76,9 @@ lain.layout.termfair.ncol = 1 lain.layout.centerfair.nmaster = 3 lain.layout.centerfair.ncol = 1 --- quake terminal -local quakeconsole = {} +-- quake application for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal }) + s.quake = lain.util.quake({ app = terminal }) end -- }}} @@ -485,13 +484,13 @@ globalkeys = awful.util.table.join( end, {description = "restore minimized", group = "client"}), - -- Dropdown terminal - awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), + -- Dropdown application + awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7) end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "h", function () fshome.show(7) end), + awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.holo b/rc.lua.holo index f4e2774..4fb698f 100644 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -78,10 +78,9 @@ lain.layout.termfair.ncol = 1 lain.layout.centerfair.nmaster = 3 lain.layout.centerfair.ncol = 1 --- quake terminal -local quakeconsole = {} +-- quake application for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal }) + s.quake = lain.util.quake({ app = terminal }) end -- }}} @@ -606,12 +605,12 @@ globalkeys = awful.util.table.join( end, {description = "restore minimized", group = "client"}), - -- Dropdown terminal - awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), + -- Dropdown application + awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 5a04e2d..5046968 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -76,10 +76,9 @@ lain.layout.termfair.ncol = 1 lain.layout.centerfair.nmaster = 3 lain.layout.centerfair.ncol = 1 --- quake terminal -local quakeconsole = {} +-- quake application for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal }) + s.quake = lain.util.quake({ app = terminal }) end -- }}} @@ -580,13 +579,13 @@ globalkeys = awful.util.table.join( end, {description = "restore minimized", group = "client"}), - -- Dropdown terminal - awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), + -- Dropdown application + awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fsroot.show(7, "--exclude-type=tmpfs") end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "h", function () fsroot.show(7) end), + awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up",