From b767be3ffd3e858c54951a67eacd5b5eadf8c7c6 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 17 Dec 2016 17:48:35 +0100 Subject: updates --- config/awesome/rc.lua | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'config/awesome/rc.lua') diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua index d10ada6..dfbc563 100644 --- a/config/awesome/rc.lua +++ b/config/awesome/rc.lua @@ -206,9 +206,9 @@ for s = 1, screen.count() do -- Widgets that are aligned to the right local right_layout = wibox.layout.fixed.horizontal() if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(volume_widget) right_layout:add(bat0_widget) right_layout:add(bat1_widget) + right_layout:add(volume_widget) right_layout:add(mytextclock) right_layout:add(mylayoutbox[s]) @@ -257,9 +257,9 @@ globalkeys = awful.util.table.join( awful.key({ modkey, }, "Tab", function () awful.client.focus.history.previous() - -- if client.focus then - -- client.focus:raise() - -- end + if client.focus then + client.focus:raise() + end end), -- Standard program @@ -269,10 +269,11 @@ globalkeys = awful.util.table.join( awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end), awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), - awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), - awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), - awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster(-1) end), + awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster( 1) end), + awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol(-1) end), + awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol( 1) end), + awful.key({ modkey, "Shift", "Control" }, "space", function () awful.tag.setncol(1) awful.tag.setnmaster(1) end), awful.key({ modkey, }, "space", function () if awful.util.table.hasitem(layouts, awful.layout.get() ) then awful.layout.inc(layouts, 1) @@ -305,12 +306,6 @@ globalkeys = awful.util.table.join( awful.key({ modkey }, "`", function () mypromptbox[mouse.screen]:run() end), awful.key({ "Ctrl", "Mod1" }, "BackSpace", awesome.quit), - awful.key({ modkey }, "x", function () awful.util.spawn_with_shell("urxvt") end), - awful.key({ modkey, "Shift" }, "x", function () awful.util.spawn_with_shell("urxvt -title FURxvt") end), - awful.key({ modkey }, "m", function () awful.util.spawn_with_shell("xterm-mail") end), - awful.key({ modkey, "Shift" }, "m", function () awful.util.spawn_with_shell("xterm-mail-cosy") end), - awful.key({ modkey }, "i", function () awful.util.spawn_with_shell("xterm-irc") end), - awful.key({ modkey, }, "F1", function () awful.layout.set(awful.layout.suit.floating) end), awful.key({ modkey, }, "F2", function () awful.layout.set(awful.layout.suit.tile) end), awful.key({ modkey, }, "F3", function () awful.layout.set(awful.layout.suit.tile.bottom) end), @@ -327,6 +322,13 @@ globalkeys = awful.util.table.join( awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer -q -D default sset Master toggle", false) end), + awful.key({ modkey }, "x", function () awful.util.spawn_with_shell("urxvt") end), + awful.key({ modkey, "Shift" }, "x", function () awful.util.spawn_with_shell("urxvt -title FURxvt") end), + awful.key({ modkey }, "m", function () awful.util.spawn_with_shell("xterm-mail") end), + awful.key({ modkey, "Shift" }, "m", function () awful.util.spawn_with_shell("xterm-mail-cosy") end), + awful.key({ modkey }, "i", function () awful.util.spawn_with_shell("xterm-irc") end), + + -- awful.key({ "Control", "Mod1"}, "End", function () awful.util.spawn_with_shell("xscreensaver-command -lock; sleep 1; systemctl suspend") end), --awful.key({ "Control", "Mod1"}, "l", function () awful.util.spawn_with_shell("xscreensaver-command -lock") end), -- awful.key({ "Control", "Mod1"}, "l", function () awful.util.spawn("xdg-screensaver lock") end), @@ -408,7 +410,8 @@ clientkeys = awful.util.table.join( awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end), -- weasel - awful.key({ "Mod1" }, "q", function (c) + -- awful.key({ "Mod1" }, "q", function (c) + awful.key({ modkey }, "1", function (c) if c.sticky then local screen = mouse.screen -- local tags = awful.tag.selectedlist(screen) -- cgit v1.2.3