X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/35394d94c4a3c5ba45b1e7d7b201e77e504ae8a6..d9e5006bacea40f629cfda8556a4c67b16821c4d:/.config/awesome/rc.lua
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 257ac3c..c06839e 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -9,9 +9,9 @@ require("debian.menu")
-- {{{ Variable definitions
-- Themes define colours, icons, and wallpapers
-- The default is a dark theme
-theme_path = "/usr/share/awesome/themes/default/theme"
+theme_path = "/usr/share/awesome/themes/default/theme.lua"
-- Uncommment this for a lighter theme
--- theme_path = "/usr/share/awesome/themes/sky/theme"
+-- theme_path = "/usr/share/awesome/themes/sky/theme.lua"
-- Actually load theme
beautiful.init(theme_path)
@@ -57,6 +57,7 @@ floatapps =
["twinkle"] = true,
["Add-ons"] = true,
["Play stream"] = true,
+ ["gscan2pdf"] = true,
}
-- Applications that should never float, assuming everything else floats
@@ -99,9 +100,9 @@ for s = 1, screen.count() do
-- Create 9 tags per screen.
for tagnumber = 1, 9 do
tags[s][tagnumber] = tag(tagnumber)
- -- Add tags to screen one by one
-- split at 0.5/50% exactly
- -- tags[s][tagnumber].mwfact = 0.5
+ tags[s][tagnumber].mwfact = 0.5
+ -- Add tags to screen one by one
tags[s][tagnumber].screen = s
awful.layout.set(layouts[5], tags[s][tagnumber])
end
@@ -114,7 +115,7 @@ end
-- Create a textbox widget
mytextbox = widget({ type = "textbox", align = "right" })
-- Set the default text in textbox
-mytextbox.text = " " .. AWESOME_RELEASE .. " "
+mytextbox.text = " " .. awesome.release .. " "
-- Create a laucher widget and a main menu
myawesomemenu = {
@@ -145,41 +146,58 @@ mywibox = {}
mypromptbox = {}
mylayoutbox = {}
mytaglist = {}
-mytaglist.buttons = { button({ }, 1, awful.tag.viewonly),
- button({ modkey }, 1, awful.client.movetotag),
- button({ }, 3, function (tag) tag.selected = not tag.selected end),
- button({ modkey }, 3, awful.client.toggletag),
- button({ }, 4, awful.tag.viewnext),
- button({ }, 5, awful.tag.viewprev) }
+mytaglist.buttons = awful.util.table.join(
+ awful.button({ }, 1, awful.tag.viewonly),
+ awful.button({ modkey }, 1, awful.client.movetotag),
+ awful.button({ }, 3, function (tag) tag.selected = not tag.selected end),
+ awful.button({ modkey }, 3, awful.client.toggletag),
+ awful.button({ }, 4, awful.tag.viewnext),
+ awful.button({ }, 5, awful.tag.viewprev)
+ )
mytasklist = {}
-mytasklist.buttons = { button({ }, 1, function (c)
- if not c:isvisible() then
- awful.tag.viewonly(c:tags()[1])
- end
- client.focus = c
- c:raise()
- end),
- button({ }, 3, function () if instance then instance:hide() end instance = awful.menu.clients({ width=250 }) end),
- button({ }, 4, function () awful.client.focus.byidx(1) end),
- button({ }, 5, function () awful.client.focus.byidx(-1) end) }
+mytasklist.buttons = awful.util.table.join(
+ awful.button({ }, 1, function (c)
+ if not c:isvisible() then
+ awful.tag.viewonly(c:tags()[1])
+ end
+ client.focus = c
+ c:raise()
+ end),
+ awful.button({ }, 3, function ()
+ if instance then
+ instance:hide()
+ instance = nil
+ else
+ instance = awful.menu.clients({ width=250 })
+ end
+ end),
+ awful.button({ }, 4, function ()
+ awful.client.focus.byidx(1)
+ if client.focus then client.focus:raise() end
+ end),
+ awful.button({ }, 5, function ()
+ awful.client.focus.byidx(-1)
+ if client.focus then client.focus:raise() end
+ end))
for s = 1, screen.count() do
-- Create a promptbox for each screen
- mypromptbox[s] = widget({ type = "textbox", align = "left" })
+ mypromptbox[s] = awful.widget.prompt({ align = "left" })
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
-- We need one layoutbox per screen.
mylayoutbox[s] = widget({ type = "imagebox", align = "right" })
- mylayoutbox[s]:buttons({ button({ }, 1, function () awful.layout.inc(layouts, 1) end),
- button({ }, 3, function () awful.layout.inc(layouts, -1) end),
- button({ }, 4, function () awful.layout.inc(layouts, 1) end),
- button({ }, 5, function () awful.layout.inc(layouts, -1) end) })
+ mylayoutbox[s]:buttons(awful.util.table.join(
+ awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
+ awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
+ awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
+ awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
-- Create a taglist widget
- mytaglist[s] = awful.widget.taglist.new(s, awful.widget.taglist.label.all, mytaglist.buttons)
+ mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
-- Create a tasklist widget
- mytasklist[s] = awful.widget.tasklist.new(function(c)
- return awful.widget.tasklist.label.currenttags(c, s)
- end, mytasklist.buttons)
+ mytasklist[s] = awful.widget.tasklist(function(c)
+ return awful.widget.tasklist.label.currenttags(c, s)
+ end, mytasklist.buttons)
-- Create the wibox
mywibox[s] = wibox({ position = "top", fg = beautiful.fg_normal, bg = beautiful.bg_normal })
@@ -217,38 +235,42 @@ batterywidget:bar_properties_set('bat', {
-- {{{ Mouse bindings
-root.buttons({
- button({ }, 3, function () mymainmenu:toggle() end),
- button({ }, 4, awful.tag.viewnext),
- button({ }, 5, awful.tag.viewprev)
-})
+root.buttons(awful.util.table.join(
+ awful.button({ }, 3, function () mymainmenu:toggle() end),
+ awful.button({ }, 4, awful.tag.viewnext),
+ awful.button({ }, 5, awful.tag.viewprev)
+))
-- }}}
-- {{{ Key bindings
-globalkeys =
-{
- key({ modkey, }, "Left", awful.tag.viewprev ),
- key({ modkey, }, "Right", awful.tag.viewnext ),
- key({ modkey, }, "Escape", awful.tag.history.restore),
-
- key({ modkey, }, "j",
+globalkeys = awful.util.table.join(
+ awful.key({ modkey, }, "Left", awful.tag.viewprev ),
+ awful.key({ modkey, }, "Right", awful.tag.viewnext ),
+ awful.key({ modkey, }, "Escape", awful.tag.history.restore),
+ awful.key({ modkey, "Shift" }, "Right", function () awful.screen.focus( 1) end),
+ awful.key({ modkey, "Shift" }, "Left", function () awful.screen.focus(-1) end),
+ awful.key({ modkey, "Shift" }, "h", awful.tag.viewprev ),
+ awful.key({ modkey, "Shift" }, "l", awful.tag.viewnext ),
+
+ awful.key({ modkey, }, "k",
function ()
awful.client.focus.byidx( 1)
if client.focus then client.focus:raise() end
end),
- key({ modkey, }, "k",
+ awful.key({ modkey, }, "j",
function ()
awful.client.focus.byidx(-1)
if client.focus then client.focus:raise() end
end),
+ awful.key({ modkey, }, "w", function () mymainmenu:show(true) end),
-- Layout manipulation
- key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end),
- key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end),
- key({ modkey, "Control" }, "j", function () awful.screen.focus( 1) end),
- key({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end),
- key({ modkey, }, "u", awful.client.urgent.jumpto),
- key({ modkey, }, "Tab",
+ awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( 1) end),
+ awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( -1) end),
+ awful.key({ modkey, "Control" }, "k", function () awful.screen.focus( 1) end),
+ awful.key({ modkey, "Control" }, "j", function () awful.screen.focus(-1) end),
+ awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
+ awful.key({ modkey, }, "Tab",
function ()
awful.client.focus.history.previous()
if client.focus then
@@ -257,58 +279,50 @@ globalkeys =
end),
-- Standard program
- key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
- key({ modkey, "Control" }, "r", awesome.restart),
- key({ modkey, "Shift" }, "q", awesome.quit),
-
- key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end),
- key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end),
- key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
- key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
- key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end),
- key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end),
- key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end),
- key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
+ awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
+ awful.key({ modkey, "Control" }, "r", awesome.restart),
+ awful.key({ modkey, "Shift" }, "q", awesome.quit),
+
+ 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, }, "space", function () awful.layout.inc(layouts, 1) end),
+ awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
-- Prompt
- key({ modkey }, "F1",
- function ()
- awful.prompt.run({ prompt = "Run: " },
- mypromptbox[mouse.screen],
- awful.util.spawn, awful.completion.bash,
- awful.util.getdir("cache") .. "/history")
- end),
+ awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
- key({ modkey }, "F4",
- function ()
- awful.prompt.run({ prompt = "Run Lua code: " },
- mypromptbox[mouse.screen],
- awful.util.eval, awful.prompt.bash,
- awful.util.getdir("cache") .. "/history_eval")
- end),
-}
+ 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)
+)
-- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them
-clientkeys =
-{
- key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
- key({ modkey, "Shift" }, "c", function (c) c:kill() end),
- key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
- key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
- key({ modkey, }, "o", awful.client.movetoscreen ),
- key({ modkey, "Shift" }, "r", function (c) c:redraw() end),
- key({ modkey }, "t", awful.client.togglemarked),
- key({ modkey,}, "m",
+clientkeys = awful.util.table.join(
+ awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
+ awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end),
+ awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
+ awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
+ awful.key({ modkey, }, "o", awful.client.movetoscreen ),
+ awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end),
+ awful.key({ modkey }, "t", awful.client.togglemarked),
+ awful.key({ modkey,}, "m",
function (c)
- if not awful.client.floating then
- awful.client.floating.toggle()
- end
+-- if not awful.client.floating then
+-- awful.client.floating.toggle()
+-- end
c.maximized_horizontal = not c.maximized_horizontal
c.maximized_vertical = not c.maximized_vertical
- end),
-}
+ end)
+)
--- Bind keyboard digits
-- Compute the maximum number of digit we need, limited to 9
keynumber = 0
for s = 1, screen.count() do
@@ -316,75 +330,73 @@ for s = 1, screen.count() do
end
for i = 1, keynumber do
- table.insert(globalkeys,
- key({ modkey }, i,
- function ()
- local screen = mouse.screen
- if tags[screen][i] then
- awful.tag.viewonly(tags[screen][i])
- end
- end))
- table.insert(globalkeys,
- key({ modkey, "Control" }, i,
- function ()
- local screen = mouse.screen
- if tags[screen][i] then
- tags[screen][i].selected = not tags[screen][i].selected
- end
- end))
- table.insert(globalkeys,
- key({ modkey, "Shift" }, i,
- function ()
- if client.focus and tags[client.focus.screen][i] then
- awful.client.movetotag(tags[client.focus.screen][i])
- end
- end))
- table.insert(globalkeys,
- key({ modkey, "Control", "Shift" }, i,
- function ()
- if client.focus and tags[client.focus.screen][i] then
- awful.client.toggletag(tags[client.focus.screen][i])
- end
- end))
-end
-
-
-for i = 1, keynumber do
- table.insert(globalkeys, key({ modkey, "Shift" }, "F" .. i,
- function ()
- local screen = mouse.screen
- if tags[screen][i] then
- for k, c in pairs(awful.client.getmarked()) do
- awful.client.movetotag(tags[screen][i], c)
- end
- end
- end))
+ globalkeys = awful.util.table.join(globalkeys,
+ awful.key({ modkey }, i,
+ function ()
+ local screen = mouse.screen
+ if tags[screen][i] then
+ awful.tag.viewonly(tags[screen][i])
+ end
+ end),
+ awful.key({ modkey, "Control" }, i,
+ function ()
+ local screen = mouse.screen
+ if tags[screen][i] then
+ tags[screen][i].selected = not tags[screen][i].selected
+ end
+ end),
+ awful.key({ modkey, "Shift" }, i,
+ function ()
+ if client.focus and tags[client.focus.screen][i] then
+ awful.client.movetotag(tags[client.focus.screen][i])
+ end
+ end),
+ awful.key({ modkey, "Control", "Shift" }, i,
+ function ()
+ if client.focus and tags[client.focus.screen][i] then
+ awful.client.toggletag(tags[client.focus.screen][i])
+ end
+ end),
+ awful.key({ modkey, "Shift" }, "F" .. i,
+ function ()
+ local screen = mouse.screen
+ if tags[screen][i] then
+ for k, c in pairs(awful.client.getmarked()) do
+ awful.client.movetotag(tags[screen][i], c)
+ end
+ end
+ end))
end
cmdmodkey = "Mod3"
-- xmms2 & sound
-table.insert(globalkeys, key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end))
-table.insert(globalkeys, key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end))
-table.insert(globalkeys, key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end))
-table.insert(globalkeys, key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end))
-table.insert(globalkeys, key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end))
-table.insert(globalkeys, key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end))
-table.insert(globalkeys, key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end))
-table.insert(globalkeys, key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end))
-table.insert(globalkeys, key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end))
-table.insert(globalkeys, key({ cmdmodkey }, "backslash", function () awful.util.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end))
-table.insert(globalkeys, key({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end))
+globalkeys = awful.util.table.join(globalkeys,
+ awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end),
+ awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end),
+ awful.key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end),
+ awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end),
+ awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end),
+ awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end),
+ awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end),
+ awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end),
+ awful.key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end),
+ awful.key({ cmdmodkey }, "backslash", function () awful.util.spawn_with_shell("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end),
+ awful.key({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn_with_shell("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end)
+)
-- misc apps
-table.insert(globalkeys, key({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end))
-table.insert(globalkeys, key({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end))
-table.insert(globalkeys, key({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end))
-table.insert(globalkeys, key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end))
-table.insert(globalkeys, key({ cmdmodkey }, "r", function () awful.util.spawn("gmrun") end))
-table.insert(globalkeys, key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end))
-table.insert(globalkeys, key({ cmdmodkey }, "x", function () awful.util.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end))
-table.insert(globalkeys, key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end))
+globalkeys = awful.util.table.join(globalkeys,
+ awful.key({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end),
+ awful.key({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end),
+ awful.key({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end),
+ awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end),
+ awful.key({ cmdmodkey }, "r", function () awful.util.spawn("gmrun") end),
+ awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end),
+ awful.key({ cmdmodkey }, "x", function () awful.util.spawn_with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end),
+ awful.key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end),
+ awful.key(nil, "XF86ScreenSaver", function () awful.util.spawn("xset dpms force off") end)
+)
-- Set keys
root.keys(globalkeys)
@@ -438,11 +450,11 @@ awful.hooks.manage.register(function (c, startup)
awful.titlebar.add(c, { modkey = modkey })
end
-- Add mouse bindings
- c:buttons({
- button({ }, 1, function (c) client.focus = c; c:raise() end),
- button({ modkey }, 1, awful.mouse.client.move),
- button({ modkey }, 3, awful.mouse.client.resize)
- })
+ c:buttons(awful.util.table.join(
+ awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+ awful.button({ modkey }, 1, awful.mouse.client.move),
+ awful.button({ modkey }, 3, awful.mouse.client.resize)
+ ))
-- New client may not receive focus
-- if they're not focusable, so set border anyway.
c.border_width = beautiful.border_width
@@ -509,29 +521,11 @@ awful.hooks.arrange.register(function (screen)
local c = awful.client.focus.history.get(screen, 0)
if c then client.focus = c end
end
-
- -- Uncomment if you want mouse warping
- --[[
- if client.focus then
- local c_c = client.focus:fullgeometry()
- local m_c = mouse.coords()
-
- if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or
- m_c.y < c_c.y or m_c.y >= c_c.y + c_c.height then
- if table.maxn(m_c.buttons) == 0 then
- mouse.coords({ x = c_c.x + 5, y = c_c.y + 5})
- end
- end
- end
- ]]
end)
-- Hook called every second
awful.hooks.timer.register(1, function ()
- -- For unix time_t lovers
- -- mytextbox.text = " " .. os.time() .. " time_t "
- -- Otherwise use:
- mytimebox.text = " " .. os.date() .. " "
+ mytimebox.text = os.date(" %a %d %b %H:%M:%S ")
end)
-- Hook called every sixty seconds
@@ -669,29 +663,13 @@ mytimebox.mouse_enter = function ()
end
mytimebox.mouse_leave = function () naughty.destroy(calendar[3]) end
-mytimebox:buttons({
- button({ }, 1, function()
- switchNaughtyMonth(-1)
- end),
- button({ }, 3, function()
- switchNaughtyMonth(1)
- end),
- button({ }, 4, function()
- switchNaughtyMonth(-1)
- end),
- button({ }, 5, function()
- switchNaughtyMonth(1)
- end),
- button({ 'Shift' }, 1, function()
- switchNaughtyMonth(-12)
- end),
- button({ 'Shift' }, 3, function()
- switchNaughtyMonth(12)
- end),
- button({ 'Shift' }, 4, function()
- switchNaughtyMonth(-12)
- end),
- button({ 'Shift' }, 5, function()
- switchNaughtyMonth(12)
- end)
-})
+mytimebox.buttons = awful.util.table.join(
+ awful.button({ }, 1, function() switchNaughtyMonth(-1) end),
+ awful.button({ }, 3, function() switchNaughtyMonth(1) end),
+ awful.button({ }, 4, function() switchNaughtyMonth(-1) end),
+ awful.button({ }, 5, function() switchNaughtyMonth(1) end),
+ awful.button({ 'Shift' }, 1, function() switchNaughtyMonth(-12) end),
+ awful.button({ 'Shift' }, 3, function() switchNaughtyMonth(12) end),
+ awful.button({ 'Shift' }, 4, function() switchNaughtyMonth(-12) end),
+ awful.button({ 'Shift' }, 5, function() switchNaughtyMonth(12) end)
+)