X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/64db5d7e1f1f7c68d94a605cf78b29970c11817f..012e264a831b62fa5cb103c186540c87d587ab37:/.config/awesome/rc.lua?ds=sidebyside
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index bdbf42d..26967cd 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,6 +1,7 @@
--- Include awesome libraries, with lots of useful function!
+-- Standard awesome library
require("awful")
require("beautiful")
+require("naughty")
-- Load Debian menu entries
require("debian.menu")
@@ -8,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)
@@ -30,18 +31,16 @@ modkey = "Mod4"
-- Table of layouts to cover with awful.layout.inc, order matters.
layouts =
{
- "tile",
- "tileleft",
- "tilebottom",
- "tiletop",
- "fairh",
- "fairv",
- "magnifier",
- "max",
- "fullscreen",
--- "spiral",
--- "dwindle",
- "floating"
+ awful.layout.suit.tile,
+ awful.layout.suit.tile.left,
+ awful.layout.suit.tile.bottom,
+ awful.layout.suit.tile.top,
+ awful.layout.suit.fair,
+ awful.layout.suit.fair.horizontal,
+ awful.layout.suit.max,
+ awful.layout.suit.max.fullscreen,
+ awful.layout.suit.magnifier,
+ awful.layout.suit.floating
}
-- Table of clients that should be set floating. The index may be either
@@ -99,11 +98,12 @@ for s = 1, screen.count() do
tags[s] = {}
-- Create 9 tags per screen.
for tagnumber = 1, 9 do
- tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[6] })
- -- Add tags to screen one by one
+ tags[s][tagnumber] = tag(tagnumber)
-- 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
-- I'm sure you want to see at least one tag.
tags[s][1].selected = true
@@ -114,7 +114,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 = {
@@ -130,7 +130,7 @@ mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.aw
}
})
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
+mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
menu = mymainmenu })
-- Create a systray
@@ -145,35 +145,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) client.focus = c; c:raise() end),
- button({ }, 3, function () 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 })
@@ -211,16 +234,90 @@ batterywidget:bar_properties_set('bat', {
-- {{{ Mouse bindings
-awesome.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 = 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, }, "j",
+ function ()
+ awful.client.focus.byidx( 1)
+ if client.focus then client.focus:raise() end
+ end),
+ awful.key({ modkey, }, "k",
+ 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
+ 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, "Control" }, "j", function () awful.screen.focus( 1) end),
+ awful.key({ modkey, "Control" }, "k", 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
+ client.focus:raise()
+ end
+ end),
+
+ -- Standard program
+ 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
+ awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() 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 = 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
+ c.maximized_horizontal = not c.maximized_horizontal
+ c.maximized_vertical = not c.maximized_vertical
+ end)
+)
--- Bind keyboard digits
-- Compute the maximum number of digit we need, limited to 9
keynumber = 0
for s = 1, screen.count() do
@@ -228,165 +325,75 @@ for s = 1, screen.count() do
end
for i = 1, keynumber do
- keybinding({ modkey }, i,
- function ()
- local screen = mouse.screen
- if tags[screen][i] then
- awful.tag.viewonly(tags[screen][i])
- end
- end):add()
- keybinding({ modkey, "Control" }, i,
- function ()
- local screen = mouse.screen
- if tags[screen][i] then
- tags[screen][i].selected = not tags[screen][i].selected
- end
- end):add()
- keybinding({ modkey, "Shift" }, i,
- function ()
- if client.focus then
- if tags[client.focus.screen][i] then
- awful.client.movetotag(tags[client.focus.screen][i])
- end
- end
- end):add()
- keybinding({ modkey, "Control", "Shift" }, i,
- function ()
- if client.focus then
- if tags[client.focus.screen][i] then
- awful.client.toggletag(tags[client.focus.screen][i])
- end
- end
- end):add()
+ 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
-keybinding({ modkey }, "Left", awful.tag.viewprev):add()
-keybinding({ modkey }, "Right", awful.tag.viewnext):add()
-keybinding({ modkey }, "Escape", awful.tag.history.restore):add()
-
--- Standard program
-keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add()
-
-keybinding({ modkey, "Control" }, "r", function ()
- mypromptbox[mouse.screen].text =
- awful.util.escape(awful.util.restart())
- end):add()
-keybinding({ modkey, "Shift" }, "q", awesome.quit):add()
-
--- Client manipulation
-keybinding({ modkey }, "m", awful.client.maximize):add()
-keybinding({ modkey }, "f", function () if client.focus then client.focus.fullscreen = not client.focus.fullscreen end end):add()
-keybinding({ modkey, "Shift" }, "c", function () if client.focus then client.focus:kill() end end):add()
-keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add()
-keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end):add()
-keybinding({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(1) end):add()
-keybinding({ modkey, "Shift" }, "k", function () awful.client.swap.byidx(-1) end):add()
-keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add()
-keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add()
-keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add()
-keybinding({ modkey, "Control" }, "Return", function () if client.focus then client.focus:swap(awful.client.getmaster()) end end):add()
-keybinding({ modkey }, "o", awful.client.movetoscreen):add()
-keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add()
-keybinding({ modkey }, "u", awful.client.urgent.jumpto):add()
-keybinding({ modkey, "Shift" }, "r", function () if client.focus then client.focus:redraw() end end):add()
-
--- Layout manipulation
-keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add()
-keybinding({ modkey }, "h", function () awful.tag.incmwfact(-0.05) end):add()
-keybinding({ modkey, "Shift" }, "h", function () awful.tag.incnmaster(1) end):add()
-keybinding({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end):add()
-keybinding({ modkey, "Control" }, "h", function () awful.tag.incncol(1) end):add()
-keybinding({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end):add()
-keybinding({ modkey }, "space", function () awful.layout.inc(layouts, 1) end):add()
-keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add()
-
--- Prompt
-keybinding({ modkey }, "F1", function ()
- awful.prompt.run({ prompt = "Run: " }, mypromptbox[mouse.screen], awful.util.spawn, awful.completion.bash,
- awful.util.getdir("cache") .. "/history")
- end):add()
-keybinding({ 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):add()
-
-keybinding({ modkey, "Ctrl" }, "i", function ()
- local s = mouse.screen
- if mypromptbox[s].text then
- mypromptbox[s].text = nil
- elseif client.focus then
- mypromptbox[s].text = nil
- if client.focus.class then
- mypromptbox[s].text = "Class: " .. client.focus.class .. " "
- end
- if client.focus.instance then
- mypromptbox[s].text = mypromptbox[s].text .. "Instance: ".. client.focus.instance .. " "
- end
- if client.focus.role then
- mypromptbox[s].text = mypromptbox[s].text .. "Role: ".. client.focus.role
- end
- end
- end):add()
-
---- Tabulous, tab manipulation
-require("tabulous")
-keybinding({ modkey, "Control" }, "y", function ()
- local tabbedview = tabulous.tabindex_get()
- local nextclient = awful.client.next(1)
-
- if not tabbedview then
- tabbedview = tabulous.tabindex_get(nextclient)
-
- if not tabbedview then
- tabbedview = tabulous.tab_create()
- tabulous.tab(tabbedview, nextclient)
- else
- tabulous.tab(tabbedview, client.focus)
- end
- else
- tabulous.tab(tabbedview, nextclient)
- end
-end):add()
-
-keybinding({ modkey, "Shift" }, "y", tabulous.untab):add()
-
-keybinding({ modkey }, "y", function ()
- local tabbedview = tabulous.tabindex_get()
-
- if tabbedview then
- local n = tabulous.next(tabbedview)
- tabulous.display(tabbedview, n)
- end
-end):add()
-
--- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them
-keybinding({ modkey }, "t", awful.client.togglemarked):add()
-keybinding({ modkey, 'Shift' }, "t", function ()
- local tabbedview = tabulous.tabindex_get()
- local clients = awful.client.getmarked()
-
- if not tabbedview then
- tabbedview = tabulous.tab_create(clients[1])
- table.remove(clients, 1)
- end
-
- for k,c in pairs(clients) do
- tabulous.tab(tabbedview, c)
- end
+cmdmodkey = "Mod3"
-end):add()
+-- xmms2 & sound
+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("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end),
+ awful.key({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end)
+)
-for i = 1, keynumber do
- keybinding({ 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):add()
-end
+-- misc apps
+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("/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)
+)
+
+-- Set keys
+root.keys(globalkeys)
-- }}}
-- {{{ Hooks
@@ -417,24 +424,31 @@ end)
-- Hook function to execute when the mouse enters a client.
awful.hooks.mouse_enter.register(function (c)
-- Sloppy focus, but disabled for magnifier layout
- if awful.layout.get(c.screen) ~= "magnifier"
+ if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
and awful.client.focus.filter(c) then
client.focus = c
end
end)
-- Hook function to execute when a new client appears.
-awful.hooks.manage.register(function (c)
+awful.hooks.manage.register(function (c, startup)
+ -- If we are not managing this application at startup,
+ -- move it to the screen where the mouse is.
+ -- We only do it for filtered windows (i.e. no dock, etc).
+ if not startup and awful.client.focus.filter(c) then
+ c.screen = mouse.screen
+ end
+
if use_titlebar then
-- Add a titlebar
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, function (c) c:mouse_move() end),
- button({ modkey }, 3, function (c) c:mouse_resize() end)
- })
+ 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
@@ -445,13 +459,13 @@ awful.hooks.manage.register(function (c)
local cls = c.class
local inst = c.instance
if floatapps[cls] then
- c.floating = floatapps[cls]
+ awful.client.floating.set(c, floatapps[cls])
elseif floatapps[inst] then
- c.floating = floatapps[inst]
+ awful.client.floating.set(c, floatapps[inst])
end
-- Override with tiledapps
- c.floating = not (tiledapps[inst] or tiledapps[cls])
+ awful.client.floating.set(c, not (tiledapps[inst] or tiledapps[cls]))
-- Check application->screen/tag mappings.
local target
@@ -468,24 +482,28 @@ awful.hooks.manage.register(function (c)
-- Do this after tag mapping, so you don't see it on the wrong tag for a split second.
client.focus = c
+ -- Set key bindings
+ c:keys(clientkeys)
+
-- Set the windows at the slave,
-- i.e. put it at the end of others instead of setting it master.
-- awful.client.setslave(c)
-- Honor size hints: if you want to drop the gaps between windows, set this to false.
- c.honorsizehints = true
+ c.size_hints_honor = true
-- Maximise some
if maxapps[inst] or maxapps[cls] then
- awful.client.maximize(c)
+ c.maximized_horizontal = not c.maximized_horizontal
+ c.maximized_vertical = not c.maximized_vertical
end
end)
-- Hook function to execute when arranging the screen.
-- (tag switch, new client, etc)
awful.hooks.arrange.register(function (screen)
- local layout = awful.layout.get(screen)
- if layout then
+ local layout = awful.layout.getname(awful.layout.get(screen))
+ if layout and beautiful["layout_" ..layout] then
mylayoutbox[screen].image = image(beautiful["layout_" .. layout])
else
mylayoutbox[screen].image = nil
@@ -497,29 +515,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
@@ -547,7 +547,7 @@ function get_acpibatt()
-- Battery 0: Full, 100%
-- so find the first bit first and then go look for the time
local st, en, status, percent = string.find(s, '%a+%s%d:%s(%a+),%s(%d+%%)');
- local st, en, time = string.find(s, ',%s(%d+:%d+:%d+)%s%a+', en);
+ local st, en, time = string.find(s, ',%s(%d+:%d+):%d+%s%a+', en);
if not status or not percent then -- time can be empty if we're full
return "couldn't parse line " .. s
@@ -558,14 +558,12 @@ function get_acpibatt()
end
if status == 'Charging' then
- status = 'c';
- elseif status == 'Discarching' then
- status = 'd';
+ return 'â ' .. percent;
+ elseif status == 'Discharging' then
+ return 'â '.. time;
else
- status = '-';
+ return '';
end
-
- return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left';
end
-- }}}
@@ -587,37 +585,12 @@ end
--}}}
-- Set up some hooks
-awful.hooks.timer.register(120, hook_battery)
+awful.hooks.timer.register(20, hook_battery)
-- awful.hooks.timer.register(5, get_bat)
-- }}}
-cmdmodkey = "Mod3"
-
--- xmms2 & sound
-keybinding({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end):add()
-keybinding({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end):add()
-keybinding({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end):add()
-keybinding({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end):add()
-keybinding({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end):add()
-keybinding({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end):add()
-keybinding({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end):add()
-keybinding({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end):add()
-keybinding({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end):add()
-keybinding({ cmdmodkey }, "backslash", function () awful.util.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end):add()
-keybinding({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end):add()
-
--- misc apps
-keybinding({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end):add()
-keybinding({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end):add()
-keybinding({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end):add()
-keybinding({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end):add()
-keybinding({ cmdmodkey }, "r", function () awful.util.spawn("gmrun") end):add()
-keybinding({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end):add()
-keybinding({ cmdmodkey }, "x", function () awful.util.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end):add()
-keybinding({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end):add()
-
--- Highlight statusbars on the screen that has focus,
--- set this to false if you only have one screen or
+-- Highlight statusbars on the screen that has focus,
+-- set this to false if you only have one screen or
-- you don't like it :P
if screen.count() > 1 then
statusbar_highlight_focus = true
@@ -626,3 +599,71 @@ else
end
hook_battery()
+
+function displayMonth(month,year,weekStart)
+ local t,wkSt=os.time{year=year, month=month+1, day=0},weekStart or 1
+ local d=os.date("*t",t)
+ local mthDays,stDay=d.day,(d.wday-d.day-wkSt+1)%7
+
+ local lines = {}
+
+ for x=0,6 do
+ lines[x+1] = os.date("%a ",os.time{year=2006,month=1,day=x+wkSt})
+ end
+ lines[8] = " "
+
+ local writeLine = 1
+ while writeLine < (stDay + 1) do
+ lines[writeLine] = lines[writeLine] .. " "
+ writeLine = writeLine + 1
+ end
+
+ for x=1,mthDays do
+ if writeLine == 8 then
+ writeLine = 1
+ end
+ if writeLine == 1 or x == 1 then
+ lines[8] = lines[8] .. os.date(" %V",os.time{year=year,month=month,day=x})
+ end
+ if (#(tostring(x)) == 1) then
+ x = " " .. x
+ end
+ lines[writeLine] = lines[writeLine] .. " " .. x
+ writeLine = writeLine + 1
+ end
+ local header = os.date("%B %Y\n",os.time{year=year,month=month,day=1})
+ header = string.rep(" ", math.floor((#(lines[1]) - #header) / 2 )) .. header
+
+ return header .. table.concat(lines, '\n')
+end
+
+local calendar = {}
+function switchNaughtyMonth(switchMonths)
+ if (#calendar < 3) then return end
+ local swMonths = switchMonths or 1
+ calendar[1] = calendar[1] + swMonths
+ calendar[3].box.widgets[2].text = displayMonth(calendar[1], calendar[2], 2)
+end
+
+mytimebox.mouse_enter = function ()
+ local month, year = os.date('%m'), os.date('%Y')
+ calendar = { month, year,
+ naughty.notify({
+ text = displayMonth(month, year, 2),
+ timeout = 0, hover_timeout = 0.5,
+ width = 200, screen = mouse.screen
+ })
+ }
+end
+mytimebox.mouse_leave = function () naughty.destroy(calendar[3]) 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)
+)