X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/cbf731bf1ee2026f325bf686755051c399b85e34..9ea7cab155cde2d06c96e74178a68b21e7d8ce1b:/.config/awesome/rc.lua diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 5eadc2d..5d69445 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -7,7 +7,9 @@ require("beautiful") -- Notification library require("naughty") -require("vicious") +--require("vicious") + +require("obvious.battery") -- Load Debian menu entries require("debian.menu") @@ -285,7 +287,8 @@ for s = 1, screen.count() do spacer, mytextclock, spacer, separator, spacer, - mybatterybox, + obvious.battery.widget, +-- mybatterybox, -- batterywidget, -- spacer, separator, spacer, -- cpuwidget.widget, @@ -440,17 +443,17 @@ globalkeys = awful.util.table.join(globalkeys, 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 }, "Left", function () awful.util.spawn("nyxmms2 prev") end), + awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("nyxmms2 next") end), + awful.key({ cmdmodkey }, "space", function () awful.util.spawn("nyxmms2 toggle") end), awful.key({ cmdmodkey }, "backslash", function () - local f = io.popen('xmms2 current', 'r') + local f = io.popen('nyxmms2 status', 'r') naughty.notify({ title = "Now playing", text = f:read(), timeout = 5 }) f:close() end), awful.key({ cmdmodkey, "Shift" }, "backslash", function () - local f = io.popen('xmms2 list', 'r') - naughty.notify({ title = "Playlist", text = f:read(), timeout = 15 }) + local f = io.popen('nyxmms2 list', 'r') + naughty.notify({ title = "Playlist", text = f:read("*a"), timeout = 15 }) f:close() end) ) @@ -463,7 +466,7 @@ globalkeys = awful.util.table.join(globalkeys, awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end), awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end), awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end), - awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e ssh -t irc screen -dr irc") end), + awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e ssh -Snone -t irc screen -dr irc") 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) @@ -482,17 +485,22 @@ awful.rules.rules = { focus = true, floating = true, keys = clientkeys, - buttons = clientbuttons } }, + buttons = clientbuttons }, + callback = awful.placement.centered }, { rule = { class = "URxvt" }, properties = { floating = false } }, { rule = { class = "URxvt", instance = "irc" }, properties = { floating = false, tag = tags[screen.count()][screen.count() == 1 and 2 or 1], switchtotag = true } }, - { rule = { class = "Iceweasel" }, + { rule = { class = "Iceweasel", instance = "Navigator" }, properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } }, - { rule = { class = "Iceweasel", instance = "Dialog" }, - properties = { floating = true }, callback = awful.placement.centered }, - { rule = { class = "Jpilot" }, +-- { rule = { class = "Iceweasel", instance = "Dialog" }, +-- properties = { floating = true } }, + { rule = { class = "Jpilot", instance = "jpilot" }, properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = true, floating = false } }, +-- { rule = { name = "OpenOffice.org" }, +-- properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } }, +-- { rule = { name = "Okular" }, +-- properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } }, } -- }}} @@ -523,11 +531,24 @@ client.add_signal("manage", function (c, startup) awful.placement.no_offscreen(c) end end + c.size_hints_honor = false end) client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end) client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) +function clear_urgency_flag(c) + print("property::urgent received for client: ", c) + io.flush () +-- if c.urgent then +-- c.urgent = false +-- end +end + +client.add_signal("new", function (c) + c:add_signal("property::urgent", clear_urgency_flag) +end) + -- Hook called every sixty seconds function hook_battery() mybatterybox.text = " " .. get_acpibatt() .. " " @@ -571,26 +592,10 @@ function get_acpibatt() return ''; end end -t = timer({ timeout = 20 }) -t:add_signal('timeout', hook_battery) -t:start() -hook_battery() +--t = timer({ timeout = 20 }) +--t:add_signal('timeout', hook_battery) +--t:start() +--hook_battery() +--bashets.register_lua(mybatterybox, get_acpibatt, '%1', 30) +--bashets.start() -- }}} - ---{{{ batt hook -local function get_bat() - local a = io.open("/sys/class/power_supply/BAT1/charge_full") - for line in a:lines() do - full = line - end - a:close() - local b = io.open("/sys/class/power_supply/BAT1/charge_now") - for line in b:lines() do - now = line - end - b:close() - batt=math.floor(now*100/full) - batterywidget:bar_data_add("bat",batt ) -end --- awful.hooks.timer.register(5, get_bat) ---}}}